diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-16 08:05:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-16 08:05:26 -0400 |
| commit | 2f49b60ddcb4b5682aca6f7c8607fb8e76472264 (patch) | |
| tree | edfc56bbe198481714e20662352aaa0c1ef23822 /indra/newview/llfloaterpreference.cpp | |
| parent | ae805d511d6135fec3938d822d7e6542d605cb7b (diff) | |
| parent | 14a06fd1c843c033bd670fad4f6b83d18d5107c1 (diff) | |
merge changes for storm-1482
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 7848484ac6..5fd262a720 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -751,10 +751,7 @@ void LLFloaterPreference::onBtnOK() closeFloater(false); 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); + gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE); } else { |