Added the ability to have the voice enabled in multiple viewer instances

This commit is contained in:
Latif Khalifa
2013-01-31 01:26:03 +01:00
parent 4e29b6752e
commit 4b0bac34dd
3 changed files with 41 additions and 2 deletions

View File

@@ -2503,7 +2503,7 @@ bool LLAppViewer::initConfiguration()
// This is the second instance of SL. Turn off voice support,
// but make sure the setting is *not* persisted.
LLControlVariable* disable_voice = gSavedSettings.getControl("CmdLineDisableVoice");
if(disable_voice)
if(disable_voice && !gSavedSettings.getBOOL("VoiceMultiInstance"))
{
const BOOL DO_NOT_PERSIST = FALSE;
disable_voice->setValue(LLSD(TRUE), DO_NOT_PERSIST);