From 8c35b1b58bad66bfb5302e598536c0262263cbcb Mon Sep 17 00:00:00 2001 From: "prep@lindenlab.com" Date: Fri, 14 Jun 2013 12:34:45 -0500 Subject: WIP: sh-4035 backed out changes to appearance window confirmation --- indra/llui/llpanel.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'indra/llui/llpanel.h') diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 02f8c0aba7..e63b41f97c 100755 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -116,8 +116,6 @@ public: /*virtual*/ void draw(); /*virtual*/ BOOL handleKeyHere( KEY key, MASK mask ); /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); - void handleCloseConfirmation( bool app_quitting ); - // From LLFocusableElement /*virtual*/ void setFocus( BOOL b ); @@ -253,8 +251,6 @@ public: std::string getXMLFilename() { return mXMLFilename; }; boost::signals2::connection setVisibleCallback( const commit_signal_t::slot_type& cb ); - boost::signals2::connection setCloseConfirmationCallback( const commit_signal_t::slot_type& cb ); - protected: // Override to set not found list @@ -264,7 +260,6 @@ protected: EnableCallbackRegistry::ScopedRegistrar mEnableCallbackRegistrar; commit_signal_t* mVisibleSignal; // Called when visibility changes, passes new visibility as LLSD() - commit_signal_t* mCloseConfirmationSignal; std::string mHelpTopic; // the name of this panel's help topic to display in the Help Viewer typedef std::deque factory_stack_t; @@ -272,11 +267,7 @@ protected: // for setting the xml filename when building panel in context dependent cases std::string mXMLFilename; - //Specific close-down logic in subclass - BOOL mVerifyUponClose; -public: - BOOL mForceCloseAfterVerify; - + private: BOOL mBgVisible; // any background at all? BOOL mBgOpaque; // use opaque color or image -- cgit v1.2.3