diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-12 17:00:35 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-12 17:00:35 -0800 |
| commit | 2a9056f0b74ad8dc3051488688e150a85cb0afdc (patch) | |
| tree | bca1d33e78b98cf5ef6fac7e7b9c3dffa3a7af39 /indra/newview/llfloaterpreference.cpp | |
| parent | 89671fa1ad4ef13acb264d0e047fb24b9ee5d8a4 (diff) | |
| parent | a88de5d45fe698bf9193659a677927c96c319ad6 (diff) | |
merging in latest changes
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() |