diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-12-17 00:09:01 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-12-17 00:09:01 +0100 |
| commit | 5824e60c595a3004ba24c250cad72a5eace8013f (patch) | |
| tree | a3f6839f56c3b19b59eb3509423354ebd12d4814 /indra/newview/llfloaterpreference.cpp | |
| parent | a18ea9d92923e331c0a3e179e126659e694b1c07 (diff) | |
| parent | 74d3dc41fb7e24410ba052a9c5ce2867fbdb9c0a (diff) | |
Merge with viewer-materials tip
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() |