From 59bf97529a47913f78ada9544ff9c0fae0870dfc Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 11 Jan 2016 14:48:49 -0800
Subject: [PATCH] MAINT-5978: Code review changes
---
indra/newview/llvoicevivox.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index cf8eb66dc9..ba374a0e11 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -833,7 +833,10 @@ bool LLVivoxVoiceClient::breakVoiceConnection(bool corowait)
#if LL_WINDOWS
int count = 0;
while (!mShutdownComplete && 10 > count++)
- {
+ { // Rider: This comes out to a max wait time of 10 seconds.
+ // The situation that brings us here is a call from ::terminate()
+ // and so the viewer is attempting to go away. Don't slow it down
+ // longer than this.
_sleep(1000);
}
#endif
@@ -855,7 +858,6 @@ bool LLVivoxVoiceClient::loginToVivox()
bool account_login(false);
bool send_login(true);
-
do
{
mIsLoggingIn = true;
@@ -1323,6 +1325,8 @@ bool LLVivoxVoiceClient::waitForChannel()
}
#if USE_SESSION_GROUPS
+ // Rider: This code is completely unchanged from the original state machine
+ // It does not seem to be in active use... but I'd rather not rip it out.
// create the main session group
setState(stateCreatingSessionGroup);
sessionGroupCreateSendMessage();
@@ -1352,7 +1356,6 @@ bool LLVivoxVoiceClient::waitForChannel()
else if (sessionNeedsRelog(mNextAudioSession))
{
requestRelog();
- terminateAudioSession(true);
break;
}
else if (mNextAudioSession)
@@ -1457,7 +1460,7 @@ bool LLVivoxVoiceClient::runSession(const sessionStatePtr_t &session)
mIsInitialized = true;
timeout.eventAfter(UPDATE_THROTTLE_SECONDS, timeoutEvent);
LLSD result = llcoro::suspendUntilEventOn(timeout);
- if (!result.has("timeout")) // logging the timeout event spamms the log
+ if (!result.has("timeout")) // logging the timeout event spams the log
LL_DEBUGS("Voice") << "event=" << ll_pretty_print_sd(result) << LL_ENDL;
if (result.has("session"))
{
@@ -2381,7 +2384,6 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
{
std::ostringstream stream;
-
if(mSpatialCoordsDirty)
{
LLVector3 l, u, a, vel;
--
GitLab