diff options
author | Rider Linden <rider@lindenlab.com> | 2015-10-07 16:09:08 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-10-07 16:09:08 -0700 |
commit | 1356be0fe9e15c8205e660e491185827d74bcb07 (patch) | |
tree | d0621c24f74f316b803e067ce1d6815367efdc00 /indra/newview/llappearancemgr.cpp | |
parent | 8974f7e1133232699dcc743eafbfcc8209988104 (diff) |
MAINT-5691: Browser was using deprecated outbox display type AND not correctly returning error body to application.
LLCore:HTTP now will provide and LLSD translation of the message body when possible in the case of an error HTTP result
VMM alert boxes now use type="alertmodal" rather than "outbox"
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rwxr-xr-x | indra/newview/llappearancemgr.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 720a4ff2df..025009d40b 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3440,21 +3440,6 @@ void LLAppearanceMgr::serverAppearanceUpdateCoro() if (!status || !result["success"].asBoolean()) { - if (httpResults.has("error_body")) - { - std::istringstream bodystream(httpResults["error_body"].asStringRef()); - LLSD body_llsd; - - if (LLSDSerialize::fromXML(body_llsd, bodystream, true) == LLSDParser::PARSE_FAILURE) - { - LL_WARNS() << "Unable to parse body as LLSD" << LL_ENDL; - } - else - { - result = body_llsd; - } - } - std::string message = (result.has("error")) ? result["error"].asString() : status.toString(); LL_WARNS("Avatar") << "Appearance Failure. server responded with \"" << message << "\"" << LL_ENDL; |