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

Merge branch 'SL-15999' of ssh://bitbucket.org/lindenlab/viewer into SL-15999

master
Brad Payne (Vir Linden) 2021-09-27 13:53:23 +01:00
parent 628b9dfe06 dc48e174c4
commit ec16b30f3b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvoicevivox.cpp
View File

@ -5358,7 +5358,9 @@ void LLVivoxVoiceClient::setVoiceEnabled(bool enabled)
bool LLVivoxVoiceClient::voiceEnabled()
{
return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice");
return gSavedSettings.getBOOL("EnableVoiceChat") &&
!gSavedSettings.getBOOL("CmdLineDisableVoice") &&
!gNonInteractive;
}
void LLVivoxVoiceClient::setLipSyncEnabled(BOOL enabled)