EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard.

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
index 8eaa4566ea..88811d06fe 100644
--- a/indra/newview/llfloaterpay.cpp
+++ b/indra/newview/llfloaterpay.cpp
@@ -85,10 +85,10 @@ public:
 	LLFloaterPay(const LLSD& key);
 	virtual ~LLFloaterPay();
 	/*virtual*/	BOOL	postBuild();
+	/*virtual*/ void onClose(bool app_quitting);
 	
 	void setCallback(money_callback callback) { mCallback = callback; }
 	
-	void onClose();
 
 	static void payViaObject(money_callback callback, LLSafeHandle<LLObjectSelection> selection);
 	
@@ -137,7 +137,6 @@ LLFloaterPay::LLFloaterPay(const LLSD& key)
 	  mTargetUUID(key.asUUID()),
 	  mTargetIsGroup(FALSE)
 {
-	mCloseSignal.connect(boost::bind(&LLFloaterPay::onClose, this));
 }
 
 // Destroys the object
@@ -219,7 +218,8 @@ BOOL LLFloaterPay::postBuild()
 	return TRUE;
 }
 
-void LLFloaterPay::onClose()
+// virtual
+void LLFloaterPay::onClose(bool app_quitting)
 {
 	// Deselect the objects
 	mObjectSelection = NULL;