diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-06-18 11:32:53 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-06-18 11:32:53 -0700 |
| commit | a4d60d6721c62511ba7a26352e3b5d35cd0dbb94 (patch) | |
| tree | 082fa1927273936fa07b9b500a7a3548833cbb6f /indra/llmessage/message.cpp | |
| parent | 4bcf2079f15a09d40f1d7aa61b2768cc54dc427a (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pulled merge from release.
Diffstat (limited to 'indra/llmessage/message.cpp')
| -rwxr-xr-x | indra/llmessage/message.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 4e4dcc1d81..cc2d5d66ad 100755 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -110,20 +110,20 @@ namespace { } - virtual void error(U32 status, const std::string& reason) + protected: + virtual void httpFailure() { // don't spam when agent communication disconnected already - if (status != 410) + if (HTTP_GONE != getStatus()) { - LL_WARNS("Messaging") << "error status " << status - << " for message " << mMessageName - << " reason " << reason << LL_ENDL; + LL_WARNS("Messaging") << "error for message " << mMessageName + << " " << dumpResponse() << LL_ENDL; } // TODO: Map status in to useful error code. if(NULL != mCallback) mCallback(mCallbackData, LL_ERR_TCP_TIMEOUT); } - virtual void result(const LLSD& content) + virtual void httpSuccess() { if(NULL != mCallback) mCallback(mCallbackData, LL_ERR_NOERR); } @@ -149,7 +149,7 @@ class LLMessageHandlerBridge : public LLHTTPNode void LLMessageHandlerBridge::post(LLHTTPNode::ResponsePtr response, const LLSD& context, const LLSD& input) const { - std::string name = context["request"]["wildcard"]["message-name"]; + std::string name = context[CONTEXT_REQUEST][CONTEXT_WILDCARD]["message-name"]; char* namePtr = LLMessageStringTable::getInstance()->getString(name.c_str()); LL_DEBUGS() << "Setting mLastSender " << input["sender"].asString() << LL_ENDL; |