diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 0b93d34b49..b13f9a22aa 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -4965,9 +4965,7 @@ void LLVivoxVoiceClient::setVoiceEnabled(bool enabled) bool LLVivoxVoiceClient::voiceEnabled() { - static LLUICachedControl<bool> enable_voice("EnableVoiceChat", true); - static LLUICachedControl<bool> override_disable_voice("CmdLineDisableVoice", false); - return enable_voice && ! override_disable_voice; + return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice"); } void LLVivoxVoiceClient::setLipSyncEnabled(BOOL enabled) |