diff options
Diffstat (limited to 'indra/newview/llfirstuse.cpp')
| -rw-r--r-- | indra/newview/llfirstuse.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index 97ebc02ba1..b00450eec6 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -49,7 +49,8 @@ std::set<LLString> LLFirstUse::sConfigVariables; // static void LLFirstUse::addConfigVariable(const LLString& var) { - gSavedSettings.addWarning(var); + //Don't add the warning, now that we're storing the default in the settings_default.xml file + //gSavedSettings.addWarning(var); sConfigVariables.insert(var); } @@ -256,13 +257,15 @@ void LLFirstUse::useSculptedPrim() // static void LLFirstUse::useVoice() { - if (gDisableVoice) return; - if (gSavedSettings.getWarning("FirstVoice")) - { - gSavedSettings.setWarning("FirstVoice", FALSE); - - LLFloaterVoiceWizard::showInstance(); - } + if (!gSavedSettings.getBOOL("CmdLineDisableVoice")) + { + if (gSavedSettings.getWarning("FirstVoice")) + { + gSavedSettings.setWarning("FirstVoice", FALSE); + + LLFloaterVoiceWizard::showInstance(); + } + } } // static |