summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregiondebugconsole.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-04-21 16:23:00 -0500
committerDave Parks <davep@lindenlab.com>2011-04-21 16:23:00 -0500
commit19857d0cf0eedb76cac4eb8a1a4a0b33de9e4235 (patch)
tree09d6015fedca390d1a259a9911491087cf088df5 /indra/newview/llfloaterregiondebugconsole.cpp
parent120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff)
parent4bbfdd4c1fc18162960ba61fbdad40940a4cdd89 (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)
{