livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7117 Don't Show "Unknown error" in warning dialog

master
Mnikolenko Productengine 2017-03-20 11:09:11 +02:00
parent 1132b33028
commit 459d5c6c32
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llmarketplacefunctions.cpp
View File

@ -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);
}

3
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -341,8 +341,7 @@ Initialization with the Marketplace failed because of a system or network error.
type="alertmodal">
The transaction with the Marketplace failed with the following error :
Reason : '[ERROR_REASON]'
[ERROR_DESCRIPTION]
[ERROR_REASON][ERROR_DESCRIPTION]
<usetemplate
name="okbutton"