diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-14 10:11:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-14 10:11:37 -0400 |
| commit | 0c650a3653d7ced102d607bacb45725109f5fe1f (patch) | |
| tree | 55a53adfd68847283c4ff574154f98024a17fad5 /indra | |
| parent | 4e537be8abb141e0a29679e15434bbcef7662dfa (diff) | |
provide defaults for voice control settings
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 6062eea68d..0b93d34b49 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -4965,8 +4965,8 @@ void LLVivoxVoiceClient::setVoiceEnabled(bool enabled) bool LLVivoxVoiceClient::voiceEnabled() { - static LLUICachedControl<bool> enable_voice("EnableVoiceChat"); - static LLUICachedControl<bool> override_disable_voice("CmdLineDisableVoice"); + static LLUICachedControl<bool> enable_voice("EnableVoiceChat", true); + static LLUICachedControl<bool> override_disable_voice("CmdLineDisableVoice", false); return enable_voice && ! override_disable_voice; } |