Merge branch 'master' of https://github.com/erwincoumans/bullet3
This commit is contained in:
@@ -67,7 +67,11 @@ struct GRPCNetworkedInternalData
|
||||
{
|
||||
if (m_isConnected)
|
||||
return true;
|
||||
std::string hostport = m_hostName + ':' + std::to_string(m_port);
|
||||
std::string hostport = m_hostName;
|
||||
if (m_port >= 0)
|
||||
{
|
||||
hostport += ':' + std::to_string(m_port);
|
||||
}
|
||||
m_grpcChannel = grpc::CreateChannel(
|
||||
hostport, grpc::InsecureChannelCredentials());
|
||||
|
||||
|
||||
@@ -255,7 +255,11 @@ int main(int argc, char** argv)
|
||||
int port = 6667;
|
||||
parseArgs.GetCmdLineArgument("port", port);
|
||||
std::string hostName = "localhost";
|
||||
std::string hostNamePort = hostName + ":" + std::to_string(port);
|
||||
std::string hostNamePort = hostName;
|
||||
if (port>=0)
|
||||
{
|
||||
hostNamePort += ":" + std::to_string(port);
|
||||
}
|
||||
|
||||
gVerboseNetworkMessagesServer = parseArgs.CheckCmdLineFlag("verbose");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user