summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregiondebugconsole.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-04-22 11:50:19 -0500
committerDave Parks <davep@lindenlab.com>2011-04-22 11:50:19 -0500
commit764412f9b5e8d69950f9866a60299b1b458339c6 (patch)
tree7e9d634faddd40edf8ed715e7b479d1336ed7697 /indra/newview/llfloaterregiondebugconsole.cpp
parentb15dca22637b0b2c1947b758a93f51163fb48cf1 (diff)
parent0349d1f29197ca00c9eb7278d97bd56ea4d2050a (diff)
merge
Diffstat (limited to 'indra/newview/llfloaterregiondebugconsole.cpp')
-rw-r--r--indra/newview/llfloaterregiondebugconsole.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp
index ada0dcf569..c7fab2573f 100644
--- a/indra/newview/llfloaterregiondebugconsole.cpp
+++ b/indra/newview/llfloaterregiondebugconsole.cpp
@@ -58,8 +58,6 @@ namespace
{
// Signal used to notify the floater of responses from the asynchronous
// API.
- typedef boost::signals2::signal<
- void (const std::string& output)> console_reply_signal_t;
console_reply_signal_t sConsoleReplySignal;
const std::string PROMPT("\n\n> ");
@@ -132,6 +130,11 @@ namespace
};
}
+boost::signals2::connection LLFloaterRegionDebugConsole::setConsoleReplyCallback(const console_reply_signal_t::slot_type& cb)
+{
+ return sConsoleReplySignal.connect(cb);
+}
+
LLFloaterRegionDebugConsole::LLFloaterRegionDebugConsole(LLSD const & key)
: LLFloater(key), mOutput(NULL)
{