diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-14 14:17:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-14 14:17:00 -0400 |
| commit | 5516d33425bcd0833ad9384b6ab4d18d8a72da3a (patch) | |
| tree | 99e8056c05aad6d8599840789896caf9cf348c95 /indra/newview | |
| parent | 0c650a3653d7ced102d607bacb45725109f5fe1f (diff) | |
remove use of cached controls for enable and override of voice
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) |