6 files changed, 65 insertions, 2 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index da9cdc6..333c8b5 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -404,6 +404,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>ResetAllPreferences</key>
+  <map>
+    <key>Comment</key>
+    <string>Reset all preferences to their default values on successful quit</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>RezWithLandGroup</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 44693c2..79a78b9 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1362,13 +1362,24 @@ bool LLAppViewer::cleanup()
         // Store the time of our current logoff
         gSavedPerAccountSettings.setU32("LastLogoff", time_corrected());
 
+        // Get filenames of settings files to reset if we do -- MC
+        std::string per_account_settings_filename = gSavedSettings.getString("PerAccountSettingsFile");
+        std::string settings_filename = gSavedSettings.getString("ClientSettingsFile");
+
+        // Reset all preferences to default settings before we save everything -- MC
+        if (gSavedSettings.getBOOL("ResetAllPreferences"))
+        {
+                llinfos << "Resetting all viewer preferences" << llendflush;
+                gSavedSettings.resetToDefaults();
+                gSavedPerAccountSettings.resetToDefaults();
+        }
+
         // Must do this after all panels have been deleted because panels that have persistent rects
         // save their rects on delete.
-        gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);        
+        gSavedSettings.saveToFile(settings_filename, TRUE);     
 
         // PerAccountSettingsFile should be empty if no use has been logged on.
         // *FIX:Mani This should get really saved in a "logoff" mode. 
-        std::string per_account_settings_filename = gSavedSettings.getString("PerAccountSettingsFile");
         if (!per_account_settings_filename.empty())
         {
                 gSavedPerAccountSettings.saveToFile(per_account_settings_filename, TRUE);
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index da7b8a7..e109818 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -41,6 +41,8 @@ LLPrefsAdvanced::LLPrefsAdvanced()
 {
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_advanced.xml");
         childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
+
+        childSetAction("reset_btn", onClickResetPrefs, this);
 }
 
 LLPrefsAdvanced::~LLPrefsAdvanced()
@@ -145,3 +147,21 @@ void LLPrefsAdvanced::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
         LLPrefsAdvanced* self = (LLPrefsAdvanced*)user_data;
         self->refresh();
 }
+
+// static
+void LLPrefsAdvanced::onClickResetPrefs(void* user_data)
+{
+        LLPrefsAdvanced* self = (LLPrefsAdvanced*)user_data;
+        LLNotifications::instance().add("ConfirmResetAllPreferences", LLSD(), LLSD(), boost::bind(callbackReset, _1, _2, self));
+}
+
+// static
+bool LLPrefsAdvanced::callbackReset(const LLSD& notification, const LLSD& response, LLPrefsAdvanced *self)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if ( option == 0 )
+        {
+                gSavedSettings.setBOOL("ResetAllPreferences", TRUE);
+        }
+        return false;
+}
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h
index 37fd050..efd0d40 100644
--- a/linden/indra/newview/llprefsadvanced.h
+++ b/linden/indra/newview/llprefsadvanced.h
@@ -47,6 +47,9 @@ public:
 
 private:
         static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
+        static void onClickResetPrefs(void* user_data);
+
+        static bool     callbackReset(const LLSD& notification, const LLSD& response, LLPrefsAdvanced *self);
 };
 
 #endif // LLPREFSADVANCED_H
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index e64b9b6..873f069 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6598,6 +6598,20 @@ Are you sure you want to take off all clothes?
      notext="Cancel"
      yestext="Take Off"/>
   </notification>
+
+  <notification
+   icon="alert.tga"
+   name="ConfirmResetAllPreferences"
+   type="alert">
+Are you sure you want to reset ALL preferences?
+
+Preferences will be reset when you restart [VIEWER_NAME].
+    <usetemplate
+     ignoretext="When resetting preferences"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Reset"/>
+  </notification>
   
   <notification
    icon="alert.tga"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 6c0b1f1..9c769de 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -52,4 +52,8 @@
        label="Enable Wind" left="12" mouse_opaque="true"
        name="mute_wind_check" radio_style="false" width="217" />
 
+  <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 
+       label="Reset All Preferences To Default" name="reset_btn" left="12" 
+       tool_tip="Reset all preferences to their default values (requires a restart)" />
+
 </panel>