diff options
author | Merov Linden <merov@lindenlab.com> | 2015-01-28 22:16:47 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2015-01-28 22:16:47 -0800 |
commit | 03f18a55b7836c22470033267e69f267eb1a8d18 (patch) | |
tree | 0c40f24e1b84cefb171e9efb5f165cd5a423a69c /indra/newview/llmarketplacefunctions.cpp | |
parent | 8ceb2f1bbadd5eca894117ccc90b637fa8a10c1a (diff) |
DD-320 : Special case HTTP error 422 on the Marketplace and give it a nicer error dialog
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
-rwxr-xr-x | indra/newview/llmarketplacefunctions.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index d292dd25e7..ab50506a4f 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -124,13 +124,20 @@ LLUUID getVersionFolderIfUnique(const LLUUID& folder_id) void log_SLM_warning(const std::string& request, U32 status, const std::string& reason, const std::string& code, const std::string& description) { LL_WARNS("SLM") << "SLM API : Responder to " << request << ". status : " << status << ", reason : " << reason << ", code : " << code << ", description : " << description << LL_ENDL; - // Prompt the user with the warning (so they know why things are failing) - LLSD subs; - subs["[ERROR_REASON]"] = reason; - // We do show long descriptions in the alert (unlikely to be readable). The description string will be in the log though. - subs["[ERROR_DESCRIPTION]"] = (description.length() <= 512 ? description : ""); - LLNotificationsUtil::add("MerchantTransactionFailed", subs); - + if (status == 422) + { + // Unprocessable Entity : Special case that error as it is a frequent answer when trying to list an incomplete listing + LLNotificationsUtil::add("MerchantUnprocessableEntity"); + } + else + { + // Prompt the user with the warning (so they know why things are failing) + LLSD subs; + subs["[ERROR_REASON]"] = reason; + // We do show long descriptions in the alert (unlikely to be readable). The description string will be in the log though. + subs["[ERROR_DESCRIPTION]"] = (description.length() <= 512 ? description : ""); + LLNotificationsUtil::add("MerchantTransactionFailed", subs); + } } void log_SLM_infos(const std::string& request, U32 status, const std::string& body) { |