From ec84b639ed71c1dac8457867148d8aea6d595685 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 7 Oct 2009 20:54:31 +0000 Subject: 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. --- indra/newview/llfloaterpreference.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'indra/newview/llfloaterpreference.h') diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index ce31abcd9e..34723b8c7e 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -70,8 +70,9 @@ public: void apply(); void cancel(); /*virtual*/ void draw(); - virtual BOOL postBuild(); - virtual void onOpen(const LLSD& key); + /*virtual*/ BOOL postBuild(); + /*virtual*/ void onOpen(const LLSD& key); + /*virtual*/ void onClose(bool app_quitting); // static data update, called from message handler static void updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email); @@ -79,10 +80,7 @@ public: // refresh all the graphics preferences menus static void refreshEnabledGraphics(); -protected: - - void onClose(); - +protected: void onBtnOK(); void onBtnCancel(); void onBtnApply(); -- cgit v1.2.3