diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-26 18:34:41 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-26 18:34:41 -0400 |
commit | d5f96c38e6f5838672c87e540aaaa3b1663837f8 (patch) | |
tree | 3aac617ceed3eb3ae2a1aa6cfaca9bb96d4ff4c7 /indra/newview/llfloaterregiondebugconsole.cpp | |
parent | 84202f19a52b8d04bf900a72acf4214b73acc820 (diff) | |
parent | 4b7793a119f4e4c8c4f03b6ff9adb0eb6fe94209 (diff) |
merge from viewer-pre-beta
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) { |