summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2009-11-24 14:36:57 -0800
committercallum <none@none>2009-11-24 14:36:57 -0800
commitfd74ba5467967cbdb5f7aca8b476080c66df2cd2 (patch)
treefac520db60d0b08aea8b803571a04c1a8037803d /indra/llui/llfloater.cpp
parentb0a31eaaee10b92df9e5aa80ccfeb25c5e797ac1 (diff)
parentfa88f41cccb9aeb5ccfdafbf5da5b34b72be1108 (diff)
Merge to tip
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index bf965e8e28..262afbe661 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2642,10 +2642,14 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
// open callback
if (p.open_callback.isProvided())
- initCommitCallback(p.open_callback, mOpenSignal);
+ {
+ mOpenSignal.connect(initCommitCallback(p.open_callback));
+ }
// close callback
if (p.close_callback.isProvided())
- initCommitCallback(p.close_callback, mCloseSignal);
+ {
+ mCloseSignal.connect(initCommitCallback(p.close_callback));
+ }
}
LLFastTimer::DeclareTimer POST_BUILD("Floater Post Build");