diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-03 20:40:40 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-03 22:05:01 +0300 |
| commit | a26573fefe2a3599c1c920722dec519c9481dc64 (patch) | |
| tree | 7f37d97b2d2e416038cb57e1a17729d0b10c89ec /indra/newview/llappviewer.cpp | |
| parent | 2a87b64d26fba502e6b8514084d91b1f79965fd1 (diff) | |
SL-18049 Part 1; Allow voice to be enabled in second instance
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e70fcb6e86..e9ba0550b0 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2945,13 +2945,14 @@ bool LLAppViewer::initConfiguration() if (mSecondInstance) { - // This is the second instance of SL. Turn off voice support, + // This is the second instance of SL. Mute voice, // but make sure the setting is *not* persisted. - LLControlVariable* disable_voice = gSavedSettings.getControl("CmdLineDisableVoice"); - if(disable_voice) + // Also see LLVivoxVoiceClient::voiceEnabled() + LLControlVariable* enable_voice = gSavedSettings.getControl("EnableVoiceChat"); + if(enable_voice) { const BOOL DO_NOT_PERSIST = FALSE; - disable_voice->setValue(LLSD(TRUE), DO_NOT_PERSIST); + enable_voice->setValue(LLSD(FALSE), DO_NOT_PERSIST); } } |