diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 12:05:33 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 12:05:33 -0500 |
| commit | 377544c8b40f2d35ba7b29252ed471d19bb983e5 (patch) | |
| tree | 0fb68b6d7f9ce04b7126d08365f0f6cb483e57f7 /indra/newview/llfloaterpreference.cpp | |
| parent | cc2c426e88bfff91c1da1704d5fdedee6e7e3dbb (diff) | |
| parent | 5a938e3a1c8582d6bfe6df2aa195afcdcafb355a (diff) | |
merge changes for MAINT-1955, MAINT-1958
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 5752f839ce..542e96cf16 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -750,7 +750,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() |