livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Region debug console to coroutines.

meow-7.2.2
Rider Linden 2015-05-22 16:14:00 -07:00
parent e9257f034a
commit 00b2b60a0c
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
indra/newview/llfloaterregiondebugconsole.cpp
View File

@ -35,6 +35,7 @@
#include "lllineeditor.h"
#include "lltexteditor.h"
#include "llviewerregion.h"
#include "llcorehttputil.h"
// Two versions of the sim console API are supported.
//
@ -68,6 +69,7 @@ namespace
const std::string CONSOLE_NOT_SUPPORTED(
"This region does not support the simulator console.");
#if 0
// This responder handles the initial response. Unless error() is called
// we assume that the simulator has received our request. Error will be
// called if this request times out.
@ -119,6 +121,7 @@ namespace
public:
LLTextEditor * mOutput;
};
#endif
// This handles responses for console commands sent via the asynchronous
// API.
@ -202,26 +205,73 @@ void LLFloaterRegionDebugConsole::onInput(LLUICtrl* ctrl, const LLSD& param)
}
else
{
#if 1
LLSD postData = LLSD(input->getText());
LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(url, postData,
boost::bind(&LLFloaterRegionDebugConsole::onConsoleSuccess, this, _1),
boost::bind(&LLFloaterRegionDebugConsole::onConsoleError, this, _1));
#else
// Using SimConsole (deprecated)
LLHTTPClient::post(
url,
LLSD(input->getText()),
new ConsoleResponder(mOutput));
#endif
}
}
else
{
#if 1
LLSD postData = LLSD(input->getText());
LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(url, postData,
NULL,
boost::bind(&LLFloaterRegionDebugConsole::onAsyncConsoleError, this, _1));
#else
// Using SimConsoleAsync
LLHTTPClient::post(
url,
LLSD(input->getText()),
new AsyncConsoleResponder);
#endif
}
mOutput->appendText(text, false);
input->clear();
}
void LLFloaterRegionDebugConsole::onAsyncConsoleError(LLSD result)
{
LL_WARNS("Console") << UNABLE_TO_SEND_COMMAND << LL_ENDL;
sConsoleReplySignal(UNABLE_TO_SEND_COMMAND);
}
void LLFloaterRegionDebugConsole::onConsoleError(LLSD result)
{
LL_WARNS("Console") << UNABLE_TO_SEND_COMMAND << LL_ENDL;
if (mOutput)
{
mOutput->appendText(
UNABLE_TO_SEND_COMMAND + PROMPT,
false);
}
}
void LLFloaterRegionDebugConsole::onConsoleSuccess(LLSD result)
{
if (mOutput)
{
LLSD response = result;
if (response.isMap() && response.has(LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS_CONTENT))
{
response = response[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS_CONTENT];
}
mOutput->appendText(
response.asString() + PROMPT, false);
}
}
void LLFloaterRegionDebugConsole::onReplyReceived(const std::string& output)
{
mOutput->appendText(output + PROMPT, false);

6
indra/newview/llfloaterregiondebugconsole.h
View File

@ -38,7 +38,7 @@ class LLTextEditor;
typedef boost::signals2::signal<
void (const std::string& output)> console_reply_signal_t;
class LLFloaterRegionDebugConsole : public LLFloater, public LLHTTPClient::Responder
class LLFloaterRegionDebugConsole : public LLFloater
{
public:
LLFloaterRegionDebugConsole(LLSD const & key);
@ -56,6 +56,10 @@ public:
private:
void onReplyReceived(const std::string& output);
void onAsyncConsoleError(LLSD result);
void onConsoleError(LLSD result);
void onConsoleSuccess(LLSD result);
boost::signals2::connection mReplySignalConnection;
};