diff options
author | Dessie Linden <dessie@lindenlab.com> | 2011-03-31 12:40:30 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2011-03-31 12:40:30 -0700 |
commit | 256ed564acd41891884227925ac1c6ee1448b9ae (patch) | |
tree | c3bb866b173dc4238653e998c2edc78f106bc15c /indra/llui/llfloater.cpp | |
parent | b597bc02d73e412e1a80d1cf6ea7091fa561c106 (diff) | |
parent | 3d5a8cc2e3becd92c83fb87d65dfbe802738edde (diff) |
Set release-viewer.jira to DRTVWR-42
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r-- | indra/llui/llfloater.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 35e0d9d890..d19e33ea55 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2869,7 +2869,7 @@ void LLFloater::initFromParams(const LLFloater::Params& p) // close callback if (p.close_callback.isProvided()) { - mCloseSignal.connect(initCommitCallback(p.close_callback)); + setCloseCallback(initCommitCallback(p.close_callback)); } } @@ -2879,6 +2879,11 @@ boost::signals2::connection LLFloater::setMinimizeCallback( const commit_signal_ return mMinimizeSignal->connect(cb); } +boost::signals2::connection LLFloater::setCloseCallback( const commit_signal_t::slot_type& cb ) +{ + return mCloseSignal.connect(cb); +} + LLFastTimer::DeclareTimer POST_BUILD("Floater Post Build"); bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node) |