From fa22ad457dbc549804003e576da931b4fd133e55 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 4 May 2017 17:52:50 +0300
Subject: [PATCH] MAINT-7210 Improving notification for Image upload failures
---
indra/newview/llviewerassetupload.cpp | 19 ++++++++++++-------
.../newview/skins/default/xui/en/strings.xml | 9 +++++++++
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index fbf3311ce4c..01b4fcfbe17 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -815,14 +815,19 @@ void LLViewerAssetUpload::HandleUploadError(LLCore::HttpStatus status, LLSD &res
}
else
{
- if (status.getType() == 499)
+ switch (status.getType())
{
- reason = "The server is experiencing unexpected difficulties.";
- }
- else
- {
- reason = "Error in upload request. Please visit "
- "http://secondlife.com/support for help fixing this problem.";
+ case 404:
+ reason = LLTrans::getString("AssetUploadServerUnreacheble");
+ break;
+ case 499:
+ reason = LLTrans::getString("AssetUploadServerDifficulties");
+ break;
+ case 503:
+ reason = LLTrans::getString("AssetUploadServerUnavaliable");
+ break;
+ default:
+ reason = LLTrans::getString("AssetUploadRequestInvalid");
}
}
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3dc41f65baa..c9be1414279 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -360,6 +360,15 @@ Please try logging in again in a minute.</string>
<string name="AssetErrorPriceMismatch">Viewer and server do not agree on price</string>
<string name="AssetErrorUnknownStatus">Unknown status</string>
+ <!-- Asset upload errors. -->
+ <string name="AssetUploadServerUnreacheble">Service unreachable.</string>
+ <string name="AssetUploadServerDifficulties">The server is experiencing unexpected difficulties.</string>
+ <string name="AssetUploadServerUnavaliable">Service not available or upload timeout was reached.</string>
+ <string name="AssetUploadRequestInvalid">
+Error in upload request. Please visit
+http://secondlife.com/support for help fixing this problem.
+</string>
+
<!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* -->
<!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
<string name="texture">texture</string>
--
GitLab