summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-11-08 16:07:31 -0800
committerMerov Linden <merov@lindenlab.com>2014-11-08 16:07:31 -0800
commit20173c9747e8205988d4f2f6f8d0b6c3d75e6e3d (patch)
treebd7ba08032b6878808219435eb23510858149e76
parent69baff7415bf97819134bcf4da948880ac714f91 (diff)
DD-274 : Do not display super long error description (there are in the log though)
-rwxr-xr-xindra/newview/llmarketplacefunctions.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 6ee81df792..c6660881f0 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -109,7 +109,8 @@ void log_SLM_warning(const std::string& request, U32 status, const std::string&
// Prompt the user with the warning (so they know why things are failing)
LLSD subs;
subs["[ERROR_REASON]"] = reason;
- subs["[ERROR_DESCRIPTION]"] = description;
+ // 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);
}