diff options
author | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
commit | bb0e2e6b957f9abf3ddc819d20aea3936d500467 (patch) | |
tree | bc6ed362332740ea6e5829966d1afd618f1b60fb /indra/newview/llmarketplacefunctions.cpp | |
parent | dca8d3b5f569ed0b074a58cd054ea3065a15a717 (diff) | |
parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
-rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 54f95520db..a0e19f2d19 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -121,7 +121,6 @@ namespace { { // 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. std::string description; if (result.has(LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS_CONTENT)) @@ -145,6 +144,16 @@ namespace { { description = result.asString(); } + std::string reason_lc = reason; + LLStringUtil::toLower(reason_lc); + if (!description.empty() && reason_lc.find("unknown") != std::string::npos) + { + subs["[ERROR_REASON]"] = ""; + } + else + { + subs["[ERROR_REASON]"] = "'" + reason +"'\n"; + } subs["[ERROR_DESCRIPTION]"] = description; LLNotificationsUtil::add("MerchantTransactionFailed", subs); } |