diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-29 13:32:51 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-29 13:32:51 -0400 |
| commit | fb9f092972c915ff77b3866dae302e3433b46224 (patch) | |
| tree | 03d970b890a2cd6a4f10e5d90e01fe8ed66ce3b1 /indra/newview/llfloaterpreference.cpp | |
| parent | ad96a4ef4706ae39d259281dd993a52034946425 (diff) | |
| parent | 0e3cea49aaba7fb9e4a75c4a76779ba9273549bf (diff) | |
reconciled .hgtags
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 { |