diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-13 15:58:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-13 15:58:22 -0400 |
| commit | ddc2848428022ea63c87fe836f340319da984462 (patch) | |
| tree | 4e2cb503750c7aa41d3e4371e6fadfd0fae6681e | |
| parent | bf42e11004e0adafe02d35c871ee41c59372670b (diff) | |
fix login on setup?
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 95c89a8918..8e5ae57842 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -651,10 +651,8 @@ void LLVivoxVoiceClient::voiceControlCoro() { performMicTuning(); } - else if (mVoiceEnabled) - { - waitForChannel(); - } + + waitForChannel(); // this doesn't normally return unless relog is needed or shutting down endAndDisconnectSession(); } @@ -971,7 +969,7 @@ bool LLVivoxVoiceClient::establishVoiceConnection() if (result.has("connector")) { LLVoiceVivoxStats::getInstance()->establishAttemptEnd(connected); - bool connected = result["connector"]; + bool connected = LLSD::Boolean(result["connector"]); if (!connected) { if (result.has("retry") && ++retries <= CONNECT_RETRY_MAX) @@ -4967,6 +4965,9 @@ void LLVivoxVoiceClient::setVoiceEnabled(bool enabled) bool LLVivoxVoiceClient::voiceEnabled() { + LL_DEBUGS("Voice") << "EnableVoiceChat" << (gSavedSettings.getBOOL("EnableVoiceChat") ? "on" : "off") << " ," + << "CmdLineDisableVoice" << (gSavedSettings.getBOOL("CmdLineDisableVoice") ? "on" : "off") + << LL_ENDL; return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice"); } |