From f4b6a89ab0050b7926c47f6c59e0493391d4452b Mon Sep 17 00:00:00 2001
From: rider <rider@lindenlab.com>
Date: Tue, 15 Dec 2015 11:13:47 -0800
Subject: [PATCH] Throttle consecutive connect attempts.
---
indra/newview/llappviewer.cpp | 2 +-
indra/newview/llvoicevivox.cpp | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 564e2450e80..10caeb17c5c 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 b9351dd5287..4c7cd658454 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);
}
//---------------------------------------------------------------------
--
GitLab