diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2017-05-04 17:52:50 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2017-05-04 17:52:50 +0300 |
| commit | fa22ad457dbc549804003e576da931b4fd133e55 (patch) | |
| tree | 0048c0d0b3c5b240033aabd511161bbac951916c /indra/newview | |
| parent | 00529b31b722d64699615241d95ea492134bc9bf (diff) | |
MAINT-7210 Improving notification for Image upload failures
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 19 | ||||
| -rw-r--r-- | indra/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 fbf3311ce4..01b4fcfbe1 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 3dc41f65ba..c9be141427 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> |