diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 564e2450e801c6e4197123724d7793c15cf29f58..10caeb17c5c4c8601201f95f0324290a637d95b8 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2748,7 +2748,7 @@ bool LLAppViewer::initConfiguration() // gWindowTitle = LLTrans::getString("APP_NAME"); #if LL_DEBUG - gWindowTitle += std::string(" [DEBUG]") + gWindowTitle += std::string(" [DEBUG]"); #endif if (!gArgs.empty()) { diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index b9351dd528763822a79b9ddee0b4e163415a7a2d..4c7cd658454109480b0ff1bacea312fb34b91ca0 100755 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -985,6 +985,8 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() } mConnected = mSocket->blockingConnect(mDaemonHost); + if (!mConnected) + llcoro::suspendUntilTimeout(CONNECT_THROTTLE_SECONDS); } //---------------------------------------------------------------------