diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-26 17:10:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-26 17:10:22 -0600 |
| commit | 3df1e46588c7bada79e8ee537607282fd3cdcc9f (patch) | |
| tree | eef75e841740f17360f1d38e2b23b3312e4f39b4 /indra/newview/llfloaterpreference.cpp | |
| parent | e81a3453401a3d69fabb1278ec81dddfb4c3cc43 (diff) | |
MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering enabled.
Reviewed by VoidPointer
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() |