diff options
| author | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
| commit | de78d17e912b7e2a4c563a7a428f11cce33644c0 (patch) | |
| tree | 6c415389f180f6a5d879b050670fd6cd3d987229 /indra/newview/llfloaterregiondebugconsole.cpp | |
| parent | 888b39c283e53fd128778e70e231bcb6053de4b8 (diff) | |
| parent | 1361eeae4e4538c175a32d48246897c4659cc26c (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/newview/llfloaterregiondebugconsole.cpp')
| -rw-r--r-- | indra/newview/llfloaterregiondebugconsole.cpp | 7 |
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) { |