diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-04 18:17:50 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-04 18:29:02 +0300 |
| commit | a16babdf7d96fbbe345d9e0c5df178e48539751c (patch) | |
| tree | 4d735fe46ee5c3ebd6636a6d5a251e46511d74e2 /indra/newview/llvoicevivox.cpp | |
| parent | b6cd14fc47cff62f6a30874d71be86d6639c32da (diff) | |
SL-18049 Part 4; Adjustments and fixes
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index c89fe81a85..72e0412194 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -277,7 +277,6 @@ static void killGateway() bool LLVivoxVoiceClient::sShuttingDown = false; bool LLVivoxVoiceClient::sConnected = false; -bool LLVivoxVoiceClient::sVoiceInstanceMuted = false; LLPumpIO *LLVivoxVoiceClient::sPump = nullptr; LLVivoxVoiceClient::LLVivoxVoiceClient() : @@ -355,7 +354,6 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() : sShuttingDown = false; sConnected = false; sPump = nullptr; - sVoiceInstanceMuted = LLAppViewer::instance()->isSecondInstance(); mSpeakerVolume = scale_speaker_volume(0); @@ -5645,8 +5643,7 @@ bool LLVivoxVoiceClient::voiceEnabled() { return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice") && - !gNonInteractive && - !sVoiceInstanceMuted; + !gNonInteractive; } void LLVivoxVoiceClient::setLipSyncEnabled(BOOL enabled) |