diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
commit | b3e34545a4d37444a2def3462d75e185df5535d0 (patch) | |
tree | f4a09ef60040db8399528a7f3564b5d265b3e22a /indra/llmessage/llcurl.cpp | |
parent | 7b0b5726dd2fcf5b79ed1b112891655fad0f96eb (diff) | |
parent | 54cdc322b8f2bd35b289cacf3493622e7cc51194 (diff) |
merge
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
-rw-r--r-- | indra/llmessage/llcurl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 8ffa8e4271..47041a2880 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -175,9 +175,11 @@ void LLCurl::Responder::completedRaw( { LLSD content; LLBufferStream istr(channels, buffer.get()); - if (!LLSDSerialize::fromXML(content, istr)) + const bool emit_errors = false; + if (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXML(content, istr, emit_errors)) { llinfos << "Failed to deserialize LLSD. " << mURL << " [" << status << "]: " << reason << llendl; + content["reason"] = reason; } completed(status, reason, content); |