merge with 4.0.3-release

1 files changed, 42 insertions, 63 deletions

diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp
index 40757a4d04..271fb2f9a3 100644
--- a/indra/newview/llfloaterregiondebugconsole.cpp
+++ b/indra/newview/llfloaterregiondebugconsole.cpp
@@ -30,11 +30,11 @@
 #include "llfloaterregiondebugconsole.h"
 
 #include "llagent.h"
-#include "llhttpclient.h"
 #include "llhttpnode.h"
 #include "lllineeditor.h"
 #include "lltexteditor.h"
 #include "llviewerregion.h"
+#include "llcorehttputil.h"
 
 // Two versions of the sim console API are supported.
 //
@@ -68,58 +68,6 @@ namespace
 	const std::string CONSOLE_NOT_SUPPORTED(
 		"This region does not support the simulator console.");
 
-	// 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.
-	class AsyncConsoleResponder : public LLHTTPClient::Responder
-	{
-		LOG_CLASS(AsyncConsoleResponder);
-	protected:
-		/* virtual */
-		void httpFailure()
-		{
-			LL_WARNS("Console") << dumpResponse() << LL_ENDL;
-			sConsoleReplySignal(UNABLE_TO_SEND_COMMAND);
-		}
-	};
-
-	class ConsoleResponder : public LLHTTPClient::Responder
-	{
-		LOG_CLASS(ConsoleResponder);
-	public:
-		ConsoleResponder(LLTextEditor *output) : mOutput(output)
-		{
-		}
-
-	protected:
-		/*virtual*/
-		void httpFailure()
-		{
-			LL_WARNS("Console") << dumpResponse() << LL_ENDL;
-			if (mOutput)
-			{
-				mOutput->appendText(
-					UNABLE_TO_SEND_COMMAND + PROMPT,
-					false);
-			}
-		}
-
-		/*virtual*/
-		void httpSuccess()
-		{
-			const LLSD& content = getContent();
-			LL_DEBUGS("Console") << content << LL_ENDL;
-			if (mOutput)
-			{
-				mOutput->appendText(
-					content.asString() + PROMPT, false);
-			}
-		}
-
-	public:
-		LLTextEditor * mOutput;
-	};
-
 	// This handles responses for console commands sent via the asynchronous
 	// API.
 	class ConsoleResponseNode : public LLHTTPNode
@@ -202,26 +150,57 @@ void LLFloaterRegionDebugConsole::onInput(LLUICtrl* ctrl, const LLSD& param)
 		}
 		else
 		{
-			// Using SimConsole (deprecated)
-			LLHTTPClient::post(
-				url,
-				LLSD(input->getText()),
-				new ConsoleResponder(mOutput));
+            LLSD postData = LLSD(input->getText());
+            LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(url, postData,
+                boost::bind(&LLFloaterRegionDebugConsole::onConsoleSuccess, this, _1),
+                boost::bind(&LLFloaterRegionDebugConsole::onConsoleError, this, _1));
 		}
 	}
 	else
 	{
-		// Using SimConsoleAsync
-		LLHTTPClient::post(
-			url,
-			LLSD(input->getText()),
-			new AsyncConsoleResponder);
+        LLSD postData = LLSD(input->getText());
+        LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(url, postData,
+            NULL,
+            boost::bind(&LLFloaterRegionDebugConsole::onAsyncConsoleError, this, _1));
+
 	}
 
 	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);