diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-07-19 15:06:56 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-07-19 15:06:56 -0400 |
| commit | 0f501293bdf5498369e5b6e4409cfdc758366d9e (patch) | |
| tree | e8cd32ff25f2ef00d43a69491a37a3b59f169e85 /indra/newview/llfloaterpreference.cpp | |
| parent | 792667ff8ef13e16823d96b490ea9a4f498425ea (diff) | |
| parent | 4dc0850da7469906e5ad052da71830b05005295b (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 c49191748e..84547ec38a 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -758,10 +758,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 { |