From c5c2e7b405bbbcc3d1c1756e34c3069611f0e4a1 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 3 Jun 2013 18:08:48 -0400
Subject: [PATCH] SH-4035 spec change. If you revert after quiting, SL
shutsdown.
---
indra/llui/llfloater.cpp | 5 +++++
indra/newview/llfloatersidepanelcontainer.h | 3 ++-
indra/newview/llsidepanelappearance.cpp | 10 ++++++++--
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 63491aa2964..93eca8b62ee 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -717,9 +717,13 @@ void LLFloater::closeFloater(bool app_quitting)
{
if ( mVerifyUponClose && !mForceCloseAfterVerify )
{
+
+ llinfos<<"prep#dogshit1"<<llendl;
onClose( app_quitting );
if ( mForceCloseAfterVerify )
{
+
+ llinfos<<"prep#dogshit1b"<<llendl;
return;
}
}
@@ -727,6 +731,7 @@ void LLFloater::closeFloater(bool app_quitting)
if (app_quitting)
{
+ llinfos<<"prep#dogshit2"<<llendl;
LLFloater::sQuitting = true;
}
diff --git a/indra/newview/llfloatersidepanelcontainer.h b/indra/newview/llfloatersidepanelcontainer.h
index f543cfd5c4d..b276821805b 100755
--- a/indra/newview/llfloatersidepanelcontainer.h
+++ b/indra/newview/llfloatersidepanelcontainer.h
@@ -89,7 +89,8 @@ class LLFloaterSidePanelContainer : public LLFloater
private:
LLSidepanelAppearance* getSidePanelAppearance();
-private:
+
+public:
bool mAppQuiting;
};
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 70da576c83e..775c148ea14 100755
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -151,11 +151,17 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica
toggleWearableEditPanel(FALSE);
showOutfitEditPanel();
LLVOAvatarSelf::onCustomizeEnd( FALSE );
- mRevertSet = true;
+ if ( !mLLFloaterSidePanelContainer->mAppQuiting )
+ {
+ mRevertSet = true;
+ }
+ else
+ {
+ mLLFloaterSidePanelContainer->closeFloater( true );
+ }
return false;
}
mLLFloaterSidePanelContainer->mForceCloseAfterVerify = false;
- //mRevertSet = true;
return false;
}
--
GitLab