1 files changed, 2 insertions, 14 deletions

diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index 4ea950f..e6dee2c 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -38,7 +38,6 @@
 
 // viewer includes
 #include "llnotify.h"
-#include "llfloatervoicewizard.h"
 #include "llviewercontrol.h"
 #include "llui.h"
 #include "llappviewer.h"
@@ -49,7 +48,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);
 }
 
@@ -254,18 +254,6 @@ void LLFirstUse::useSculptedPrim()
 }
 
 // static 
-void LLFirstUse::useVoice()
-{
-        if (gDisableVoice) return;
-        if (gSavedSettings.getWarning("FirstVoice"))
-        {
-                gSavedSettings.setWarning("FirstVoice", FALSE);
-
-                LLFloaterVoiceWizard::showInstance();
-        }
-}
-
-// static 
 void LLFirstUse::useMedia()
 {
         if (gSavedSettings.getWarning("FirstMedia"))