diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-14 14:27:25 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-14 14:27:25 +0200 |
| commit | b278de94c9afe3a5b838b57bd380fd28c04b29f1 (patch) | |
| tree | b5da76ed707dff7c93d2f7ad7cf4cf47ec177db8 /indra/newview/llfloaterpreference.cpp | |
| parent | e727800829be2ecf236b726b1ec7693a3adad908 (diff) | |
| parent | 0556c2c047e38d9b5e18cd31b219764c3dc89aa4 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
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); |