summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-03-13 11:56:46 -0400
committerOz Linden <oz@lindenlab.com>2017-03-13 11:56:46 -0400
commitbf42e11004e0adafe02d35c871ee41c59372670b (patch)
tree86f21a4889c847a8192bd42bc453f5637af4e8ee /indra/newview/llvoicevivox.cpp
parentfa61272bd4741f786b86c22db273c7b0a5f16924 (diff)
initialize mVoiceEnabled during setup
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r--indra/newview/llvoicevivox.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 6cc462290b..95c89a8918 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -311,7 +311,7 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
mMicVolume(0),
mMicVolumeDirty(true),
- mVoiceEnabled(voiceEnabled()),
+ mVoiceEnabled(false),
mWriteInProgress(false),
mLipSyncEnabled(false),
@@ -409,6 +409,8 @@ void LLVivoxVoiceClient::terminate()
void LLVivoxVoiceClient::cleanUp()
{
+ LL_DEBUGS("Voice") << LL_ENDL;
+
deleteAllSessions();
deleteAllVoiceFonts();
deleteVoiceFontTemplates();
@@ -997,6 +999,9 @@ bool LLVivoxVoiceClient::establishVoiceConnection()
}
}
}
+ LL_DEBUGS("Voice") << (connected ? "" : "not ") << "connected, "
+ << (giving_up ? "" : "not ") << "giving up"
+ << LL_ENDL;
} while (!connected && !giving_up);
if (giving_up)
@@ -1011,6 +1016,7 @@ bool LLVivoxVoiceClient::establishVoiceConnection()
bool LLVivoxVoiceClient::breakVoiceConnection(bool corowait)
{
+ LL_DEBUGS("Voice") << LL_ENDL;
LLEventPump &voicePump = LLEventPumps::instance().obtain("vivoxClientPump");
bool retval(true);