summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCallum Linden <callum@lindenlab.com>2021-09-24 11:46:19 -0700
committerCallum Linden <callum@lindenlab.com>2021-09-24 11:46:19 -0700
commitdc48e174c43edb770f3c2de0ac16adee5841d7ec (patch)
treed7f2aa437a7bdc677195594112738c8bcb8c21a2 /indra/newview
parenta0157baf08ab5a4ac3f667520e18a796a11b9ad7 (diff)
SL-15999 (SL-16055) Turn off voice in non-interactive mode
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvoicevivox.cpp4
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)