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/llfloatermediasettings.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloatermediasettings.h') diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h index 10dc31b4f9..e2683039cc 100644 --- a/indra/newview/llfloatermediasettings.h +++ b/indra/newview/llfloatermediasettings.h @@ -47,7 +47,9 @@ public: LLFloaterMediaSettings(const LLSD& key); ~LLFloaterMediaSettings(); - virtual BOOL postBuild(); + /*virtual*/ BOOL postBuild(); + /*virtual*/ void onClose(bool app_quitting); + static LLFloaterMediaSettings* getInstance(); static void apply(); static void initValues( const LLSD& media_settings , bool editable); @@ -70,7 +72,6 @@ protected: LLPanelMediaSettingsPermissions* mPanelMediaSettingsPermissions; - void onClose(); static void onBtnOK(void*); static void onBtnCancel(void*); static void onBtnApply(void*); -- cgit v1.2.3