diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
| commit | 2c2a4c123eb9bfa80785e5509e73c8f7f236228f (patch) | |
| tree | 83160657e9c42e9dc78f6be455f254671429bc9c /indra/newview/llfloaterpreference.cpp | |
| parent | 74b6f5dce31b5ff69ced8e1e8cd37e4c5ded2943 (diff) | |
| parent | 95da8c81f3d5afd8d888589398028883e6647333 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | 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 100644 --- 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 { |