diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-12 12:53:24 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-12 12:53:24 -0800 |
| commit | 0a16fc53cfa62447e37505214391af5f4d04bb7f (patch) | |
| tree | 655c5dbd1849cd774a11b5a4a572e2c3b00a1f52 /indra/newview/llfloaterpreference.cpp | |
| parent | 3636b10d479043c6e7386bc60af3228bd856f737 (diff) | |
| parent | 78b7a4b37c4762ea9503c1da0f79ab8fc412c2b9 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
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() |