diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-13 18:04:47 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-13 18:04:47 -0800 |
| commit | 94694be6b5aac985153aec8d396bfd47e7463acd (patch) | |
| tree | 1350032c477613e20685ccd3401069b0a23e7010 /indra/newview/llfloaterpreference.cpp | |
| parent | 569701cfc898091a414dad0650f89471b1962d49 (diff) | |
| parent | 179ab5c7353150ebaeac6e32fa55f96670c3c256 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 2c3f460701..13d8a79f8d 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -749,7 +749,10 @@ void LLFloaterPreference::onClose(bool app_quitting) { gSavedSettings.setS32("LastPrefTab", getChild<LLTabContainer>("pref core")->getCurrentPanelIndex()); LLPanelLogin::setAlwaysRefresh(false); - cancel(); + if (!app_quitting) + { + cancel(); + } } void LLFloaterPreference::onOpenHardwareSettings() |