summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.h
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2010-10-12 14:00:07 -0700
committerDave SIMmONs <simon@lindenlab.com>2010-10-12 14:00:07 -0700
commit683775aab87b815a09539ef621128f2e0007984e (patch)
tree6bf066c7db7504201fd610dbc4a4a933c60c22b7 /indra/llui/llfloater.h
parent58f0e78cb491833440d85e105593bccc2d2aa4ab (diff)
parenta8fbfa40ba6153668e1f713ae0e128224b4f400f (diff)
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/llui/llfloater.h')
-rw-r--r--indra/llui/llfloater.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index c02587d9d8..32d03f9f83 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -143,6 +143,8 @@ public:
static void setupParamsForExport(Params& p, LLView* parent);
bool buildFromFile(const std::string &filename, LLXMLNodePtr output_node = NULL);
+ boost::signals2::connection setMinimizeCallback( const commit_signal_t::slot_type& cb );
+
void initFromParams(const LLFloater::Params& p);
bool initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node = NULL);
@@ -348,6 +350,8 @@ public:
// Public so external views or floaters can watch for this floater closing
commit_signal_t mCloseSignal;
+ commit_signal_t* mMinimizeSignal;
+
protected:
std::string mRectControl;
std::string mVisibilityControl;