From 672a76d0ea08a0d0fc824e103ee4c4242b7e03ec Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sat, 15 Mar 2008 01:18:27 +0000 Subject: reverting premature commit at 82410. --- indra/newview/llfirstuse.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'indra/newview/llfirstuse.cpp') diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index b00450eec6..97ebc02ba1 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -49,8 +49,7 @@ std::set LLFirstUse::sConfigVariables; // static void LLFirstUse::addConfigVariable(const LLString& var) { - //Don't add the warning, now that we're storing the default in the settings_default.xml file - //gSavedSettings.addWarning(var); + gSavedSettings.addWarning(var); sConfigVariables.insert(var); } @@ -257,15 +256,13 @@ void LLFirstUse::useSculptedPrim() // static void LLFirstUse::useVoice() { - if (!gSavedSettings.getBOOL("CmdLineDisableVoice")) - { - if (gSavedSettings.getWarning("FirstVoice")) - { - gSavedSettings.setWarning("FirstVoice", FALSE); - - LLFloaterVoiceWizard::showInstance(); - } - } + if (gDisableVoice) return; + if (gSavedSettings.getWarning("FirstVoice")) + { + gSavedSettings.setWarning("FirstVoice", FALSE); + + LLFloaterVoiceWizard::showInstance(); + } } // static -- cgit v1.2.3