From c81b685b4217b3c321815e1993d39fb0b479a767 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 3 Jun 2013 16:10:46 -0400
Subject: Fix for sh-4221 Sometimes ctrl+q needed to be hit twice

---
 indra/llui/llfloater.cpp | 8 ++++----
 indra/llui/llfloater.h   | 2 +-
 indra/llui/llpanel.cpp   | 4 ++--
 indra/llui/llpanel.h     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index ae4961559e..63491aa296 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -704,9 +704,9 @@ void LLFloater::openFloater(const LLSD& key)
 	dirtyRect();
 }
 
-void LLFloater::verifyClose()
+void LLFloater::verifyClose( bool app_quitting )
 {
-	LLPanel::handleCloseConfirmation();
+	LLPanel::handleCloseConfirmation( app_quitting );
 }
 
 void LLFloater::closeFloater(bool app_quitting)
@@ -726,7 +726,7 @@ void LLFloater::closeFloater(bool app_quitting)
 	}	
 
 	if (app_quitting)
-	{
+	{	
 		LLFloater::sQuitting = true;
 	}
 	
@@ -2659,7 +2659,7 @@ void LLFloaterView::closeAllChildren(bool app_quitting)
 		{
 			if ( floaterp->mVerifyUponClose )
 			{			
-				floaterp->verifyClose();
+				floaterp->verifyClose(app_quitting);
 			}
 			else
 			{
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index bf71b527b3..8eb40ddd0b 100755
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -225,7 +225,7 @@ public:
 
 	// If allowed, close the floater cleanly, releasing focus.
 	virtual void	closeFloater(bool app_quitting = false);
-	virtual void	verifyClose();
+	virtual void	verifyClose( bool app_quitting = false );
 
 	// Close the floater or its host. Use when hidding or toggling a floater instance.
 	virtual void	closeHostedFloater();
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 7b7920f866..b0bdbcb7d1 100755
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -354,11 +354,11 @@ void LLPanel::handleVisibilityChange ( BOOL new_visibility )
 }
 
 
-void LLPanel::handleCloseConfirmation( )
+void LLPanel::handleCloseConfirmation( bool app_quitting)
 {	
 	if (mCloseConfirmationSignal)
 	{
-		(*mCloseConfirmationSignal)(this, LLSD() ); 
+		(*mCloseConfirmationSignal)(this, LLSD( app_quitting ) ); 
 	}
 }
 void LLPanel::setFocus(BOOL b)
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index d48fab6dd9..02f8c0aba7 100755
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -116,7 +116,7 @@ public:
 	/*virtual*/ void	draw();	
 	/*virtual*/ BOOL	handleKeyHere( KEY key, MASK mask );
 	/*virtual*/ void 	handleVisibilityChange ( BOOL new_visibility );
-				void	handleCloseConfirmation( );
+				void	handleCloseConfirmation( bool app_quitting );
 
 
 	// From LLFocusableElement
-- 
cgit v1.2.3


From c5c2e7b405bbbcc3d1c1756e34c3069611f0e4a1 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 3 Jun 2013 18:08:48 -0400
Subject: SH-4035 spec change. If you revert after quiting, SL shutsdown.

---
 indra/llui/llfloater.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llui')

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;
 	}
 	
-- 
cgit v1.2.3