Fix #673: IMs & Logging prefs don't persist

Enable per-account settings only after we have an account. Also, make
settings that are saved locally not depend on UserInfoReply being received.

1 files changed, 14 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 2fe4b4d..0f81be6 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -362,6 +362,11 @@ void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_vi
         mPrefsIM->setPersonalInfo(visibility, im_via_email, email);
 }
 
+void LLPreferenceCore::updateIsLoggedIn(bool enable)
+{
+        mPrefsIM->preparePerAccountPrefs(enable);
+}
+
 void LLPreferenceCore::refreshEnabledGraphics()
 {
         LLFloaterHardwareSettings::instance()->refreshEnabledState();
@@ -537,6 +542,15 @@ void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_
         }
 }
 
+// static
+void LLFloaterPreference::updateIsLoggedIn(bool enable)
+{
+        if(sInstance && sInstance->mPreferenceCore)
+        {
+                sInstance->mPreferenceCore->updateIsLoggedIn(enable);
+        }
+}
+
 void LLFloaterPreference::refreshEnabledGraphics()
 {
         sInstance->mPreferenceCore->refreshEnabledGraphics();