diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-12 10:13:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-12 10:13:24 -0400 |
| commit | d8931c9269a90cd01f6f6ff4de83b8fb41df11d3 (patch) | |
| tree | a048235823e3dd11e6a4e335ee19b453b6b6e4b0 /indra/newview | |
| parent | 24d405048fa0b9b26d1cb1d9e8ea8b113b867a14 (diff) | |
| parent | 87f496cf7c1c71510e4cb995661f8da5691746da (diff) | |
DRTVWR-588: Merge 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index 72ef365a6d..f435506cff 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -984,7 +984,11 @@ bool LLLocalBitmapMgr::checkTextureDimensions(std::string filename) { LLSD args; args["NAME"] = gDirUtilp->getBaseFileName(filename); - LLNotificationsUtil::add(image_info.getWarningName(), args); + if (!image_info.getWarningName().empty()) + { + args["REASON"] = LLTrans::getString(image_info.getWarningName()); + } + LLNotificationsUtil::add("CannotUploadTexture", args); return false; } @@ -1000,6 +1004,7 @@ bool LLLocalBitmapMgr::checkTextureDimensions(std::string filename) LLSD notif_args; notif_args["REASON"] = mImageLoadError; + notif_args["NAME"] = gDirUtilp->getBaseFileName(filename); LLNotificationsUtil::add("CannotUploadTexture", notif_args); return false; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a4b73879b8..8f79794006 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9102,7 +9102,7 @@ You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] icon="alertmodal.tga" name="CannotUploadTexture" type="alertmodal"> -Unable to upload texture. +Unable to upload texture: '[NAME]' [REASON] <tag>fail</tag> </notification> @@ -11987,12 +11987,4 @@ Would you like to save them first? yestext="Yes"/> </notification> - <notification - icon="notifytip.tga" - name="IncorrectFormat" - priority="high" - type="notifytip"> -Unable to upload '[NAME]' due to the following reason: incorrect image format. - </notification> - </notifications> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0b19ad1473..a23af740fe 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3932,6 +3932,8 @@ Abuse Report</string> <string name="DefaultMimeType">none/none</string> <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string> + <string name="texture_load_format_error">Incorrect image format.</string> + <string name="texture_load_empty_file">File is empty.</string> <string name="outfit_photo_load_dimensions_error">Max outfit photo size is [WIDTH]*[HEIGHT]. Please resize or use another image</string> <string name="outfit_photo_select_dimensions_error">Max outfit photo size is [WIDTH]*[HEIGHT]. Please select another texture</string> <string name="outfit_photo_verify_dimensions_error">Cannot verify photo dimensions. Please wait until photo size is displayed in picker</string> |