diff options
| author | rider <rider@lindenlab.com> | 2015-12-15 11:13:47 -0800 |
|---|---|---|
| committer | rider <rider@lindenlab.com> | 2015-12-15 11:13:47 -0800 |
| commit | f4b6a89ab0050b7926c47f6c59e0493391d4452b (patch) | |
| tree | 9b5916f5228eedc0d8699305ea6e1a7e6416cadc /indra/newview | |
| parent | de2a94665bd694d1af6a609ce9e8c1a829a5a91c (diff) | |
Throttle consecutive connect attempts.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoicevivox.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 564e2450e8..10caeb17c5 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 b9351dd528..4c7cd65845 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); } //--------------------------------------------------------------------- |