diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-21 16:26:52 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-21 16:26:52 -0400 |
| commit | ca5bd96bb0d60c795b78c883e91792d4a68ad2c1 (patch) | |
| tree | 44476d0a8e3cf0f2d32e9d7c9e8ef1c950fae306 /indra/newview/llfloaterpreference.cpp | |
| parent | 4311ee30ec52260f38ac20e70a0fc1847cc4b7d0 (diff) | |
| parent | d26356d7e16191da90cae23d3871d4e7289e175f (diff) | |
merge
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 { |