diff options
author | richard <none@none> | 2010-01-13 18:18:03 -0800 |
---|---|---|
committer | richard <none@none> | 2010-01-13 18:18:03 -0800 |
commit | 01c65e891d477b2f162cb277a2b06a6d3a4a0e9f (patch) | |
tree | fb34de1c09c931186a595093c35bde5ac66f448e /indra/newview/llfloaterpreference.cpp | |
parent | 630f1546881d6879b3ad4e3165413138d69a27cd (diff) | |
parent | faae541261f4e606fd1b90927818bd9239700635 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r-- | indra/newview/llfloaterpreference.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index d0716f67b8..9af37e8174 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -602,8 +602,8 @@ void LLFloaterPreference::onBtnOK() apply(); closeFloater(false); - gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE ); LLUIColorTable::instance().saveUserSettings(); + gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE ); std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); // save all settings, even if equals defaults gCrashSettings.saveToFile(crash_settings_filename, FALSE); |