livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove use of cached controls for enable and override of voice

meow-7.2.2
Oz Linden 2017-03-14 14:17:00 -04:00
parent 0c650a3653
commit 5516d33425
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvoicevivox.cpp
View File

@ -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)