diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
| commit | 69b062b90889fe581de0d10d60b979cb7883b4a0 (patch) | |
| tree | 6286fc967bc0f551a9e67b8377bdfbc743f090b2 /indra/llmessage/message.cpp | |
| parent | c67db8e75511de879c69de0faf06a88ac3cc731d (diff) | |
| parent | 425ff28e4bc38ba3f7bfeade4a72dce4eba63b54 (diff) | |
merge with viewer-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 ae95087377..5a63da628d 100755 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -113,20 +113,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 << llendl; + 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); } @@ -152,7 +152,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()); lldebugs << "Setting mLastSender " << input["sender"].asString() << llendl; |