diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-12-17 16:15:46 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-12-17 16:15:46 -0800 |
| commit | ab93c0ffb5f7601a7baee770f904537981be431a (patch) | |
| tree | a49af1aba5f59201ce9a3d617582fb55b9c7cef5 /indra/newview/llfloaterpreference.cpp | |
| parent | 46f56f5d528ea3566f00e058250cb06361c2c10e (diff) | |
EXT-3534 Default Location Obscures the Top of an Open Notecard When Nav and/or Favorites Bar are Hidden
EXT-3334 [BSI] Chat/IM log preferences not retained
EXT-3402 Replace "X" for checked menu items with a check mark glyph [Patch Included]
reviewed by richard
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 ab27375b87..4cd0727ce2 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -628,12 +628,9 @@ void LLFloaterPreference::onBtnOK() if (canClose()) { + saveSettings(); apply(); - // Here we do not want to cancel on close, so we do this funny thing - // that prevents cancel from undoing our changes when we hit OK - mCancelOnClose = false; closeFloater(false); - mCancelOnClose = true; gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE ); LLUIColorTable::instance().saveUserSettings(); std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); |