1 files changed, 20 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 0f81be6..c99d75d 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -365,6 +365,7 @@ void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_vi
 void LLPreferenceCore::updateIsLoggedIn(bool enable)
 {
         mPrefsIM->preparePerAccountPrefs(enable);
+        mAudioPanel->updateIsLoggedIn(enable);
 }
 
 void LLPreferenceCore::refreshEnabledGraphics()
@@ -456,6 +457,25 @@ void LLFloaterPreference::show(void*)
 }
 
 
+// static
+void LLFloaterPreference::onClickResetPrefs(void* user_data)
+{
+        LLFloaterPreference* self = (LLFloaterPreference*)user_data;
+        LLNotifications::instance().add("ConfirmResetAllPreferences", LLSD(), LLSD(), boost::bind(callbackReset, _1, _2, self));
+}
+
+// static
+bool LLFloaterPreference::callbackReset(const LLSD& notification, const LLSD& response, LLFloaterPreference *self)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if ( option == 0 )
+        {
+                gSavedSettings.setBOOL("ResetAllPreferences", TRUE);
+        }
+        return false;
+}
+
+
 // static 
 void LLFloaterPreference::onBtnOK( void* userdata )
 {