1 files changed, 32 insertions, 21 deletions

diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 8cb8344..a1f8e29 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -70,6 +70,29 @@ void LLHTTPClient::Responder::result(const LLSD& content)
 {
 }
 
+// virtual 
+void LLHTTPClient::Responder::completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels,
+                                                                const LLIOPipe::buffer_ptr_t& buffer)
+{
+        LLBufferStream istr(channels, buffer.get());
+        LLSD content;
+
+        if (200 <= status && status < 300)
+        {
+                LLSDSerialize::fromXML(content, istr);
+/*
+                const S32 parseError = -1;
+                if(LLSDSerialize::fromXML(content, istr) == parseError)
+                {
+                        mStatus = 498;
+                        mReason = "Client Parse Error";
+                }
+*/
+        }
+        
+        completed(status, reason, content);
+}
+
 // virtual
 void LLHTTPClient::Responder::completed(U32 status, const std::string& reason, const LLSD& content)
 {
@@ -108,25 +131,9 @@ namespace
                 virtual void complete(const LLChannelDescriptors& channels,
                                                                 const buffer_ptr_t& buffer)
                 {
-                        LLBufferStream istr(channels, buffer.get());
-                        LLSD content;
-
-                        if (200 <= mStatus && mStatus < 300)
-                        {
-                                LLSDSerialize::fromXML(content, istr);
-/*
-                                const S32 parseError = -1;
-                                if(LLSDSerialize::fromXML(content, istr) == parseError)
-                                {
-                                        mStatus = 498;
-                                        mReason = "Client Parse Error";
-                                }
-*/
-                        }
-
                         if (mResponder.get())
                         {
-                                mResponder->completed(mStatus, mReason, content);
+                                mResponder->completedRaw(mStatus, mReason, channels, buffer);
                         }
                 }
 
@@ -243,15 +250,18 @@ namespace
         LLPumpIO* theClientPump = NULL;
 }
 
-static void request(const std::string& url, LLURLRequest::ERequestAction method,
-        Injector* body_injector, LLHTTPClient::ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS)
+static void request(
+        const std::string& url,
+        LLURLRequest::ERequestAction method,
+        Injector* body_injector,
+        LLHTTPClient::ResponderPtr responder,
+        const F32 timeout=HTTP_REQUEST_EXPIRY_SECS)
 {
         if (!LLHTTPClient::hasPump())
         {
                 responder->completed(U32_MAX, "No pump", LLSD());
                 return;
         }
-
         LLPumpIO::chain_t chain;
 
         LLURLRequest *req = new LLURLRequest(method, url);
@@ -262,7 +272,8 @@ static void request(const std::string& url, LLURLRequest::ERequestAction method,
         }
         req->setCallback(new LLHTTPClientURLAdaptor(responder));
 
-        if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem) {
+        if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem)
+        {
                 req->addHeader(llformat("X-SecondLife-UDP-Listen-Port: %d",
                                                                 gMessageSystem->mPort).c_str());
         }