reverting premature commit at 82410.

1 files changed, 8 insertions, 11 deletions

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<LLString> 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