diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-27 13:53:23 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-27 13:53:23 +0100 |
| commit | ec16b30f3b178595cbad0c851a94300fd88afdf2 (patch) | |
| tree | 33471ca40293f3b3a4ffeddafb22784c573cb38a /indra/newview | |
| parent | 628b9dfe0639a7dfccd05533671cbbf1d93d5ba0 (diff) | |
| parent | dc48e174c43edb770f3c2de0ac16adee5841d7ec (diff) | |
Merge branch 'SL-15999' of ssh://bitbucket.org/lindenlab/viewer into SL-15999
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 4d2eac8c09..86fe7c19bd 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -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) |