merge

1 files changed, 2 insertions, 21 deletions

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index b0bdbcb7d1..67472ad166 100755
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -114,10 +114,7 @@ LLPanel::LLPanel(const LLPanel::Params& p)
 	mCommitCallbackRegistrar(false),
 	mEnableCallbackRegistrar(false),
 	mXMLFilename(p.filename),
-	mVisibleSignal(NULL),
-	mCloseConfirmationSignal(NULL),
-	mVerifyUponClose(false),
-	mForceCloseAfterVerify(false)
+	mVisibleSignal(NULL)
 	// *NOTE: Be sure to also change LLPanel::initFromParams().  We have too
 	// many classes derived from LLPanel to retrofit them all to pass in params.
 {
@@ -130,7 +127,6 @@ LLPanel::LLPanel(const LLPanel::Params& p)
 LLPanel::~LLPanel()
 {
 	delete mVisibleSignal;
-	delete mCloseConfirmationSignal;
 }
 
 // virtual
@@ -353,14 +349,6 @@ void LLPanel::handleVisibilityChange ( BOOL new_visibility )
 		(*mVisibleSignal)(this, LLSD(new_visibility) ); // Pass BOOL as LLSD
 }
 
-
-void LLPanel::handleCloseConfirmation( bool app_quitting)
-{	
-	if (mCloseConfirmationSignal)
-	{
-		(*mCloseConfirmationSignal)(this, LLSD( app_quitting ) ); 
-	}
-}
 void LLPanel::setFocus(BOOL b)
 {
 	if( b && !hasFocus())
@@ -971,17 +959,10 @@ boost::signals2::connection LLPanel::setVisibleCallback( const commit_signal_t::
 	{
 		mVisibleSignal = new commit_signal_t();
 	}
+
 	return mVisibleSignal->connect(cb);
 }
 
-boost::signals2::connection LLPanel::setCloseConfirmationCallback( const commit_signal_t::slot_type& cb )
-{
-	if (!mCloseConfirmationSignal)
-	{
-		mCloseConfirmationSignal = new commit_signal_t();
-	}	
-	return mCloseConfirmationSignal->connect(cb);
-}
 static LLFastTimer::DeclareTimer FTM_BUILD_PANELS("Build Panels");
 
 //-----------------------------------------------------------------------------