SH-4035 spec change. If you revert after quiting, SL shutsdown.

3 files changed, 15 insertions, 3 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 63491aa296..93eca8b62e 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 f543cfd5c4..b276821805 100755
--- a/indra/newview/llfloatersidepanelcontainer.h
+++ b/indra/newview/llfloatersidepanelcontainer.h
@@ -89,7 +89,8 @@ public:
 
 private:
 	LLSidepanelAppearance* getSidePanelAppearance();
-private: 
+
+public: 
 	bool mAppQuiting;
 };
 
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 70da576c83..775c148ea1 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;
 }