diff options
| author | angela <angela@lindenlab.com> | 2010-01-12 11:40:52 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-01-12 11:40:52 +0800 |
| commit | e9e651f5e4cf5dea29cf3f0340663ab404a46bcd (patch) | |
| tree | 046f0604d7f4fb284a75b613f937efb25f26ac67 /indra/newview/llfloaterpreference.cpp | |
| parent | 82c1e6cce26b1584a3718a478b69d2618ad0c178 (diff) | |
| parent | 43d97298d5fdd3f5071df1e5bf70c6a59547ff06 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
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); |