Skip to content

Commit 4796180

Browse files
committed
#4541 Fix reused message
it was also in use by local bitmaps
1 parent d859557 commit 4796180

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

indra/newview/llfloaterimagepreview.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
433433
LLStringUtil::format_map_t args;
434434
args["PIXELS"] = llformat("%dM", (S32)(MAX_IMAGE_AREA / 1000000));
435435

436-
mImageLoadError = LLTrans::getString("texture_load_dimensions_error", args);
436+
mImageLoadError = LLTrans::getString("texture_load_area_error", args);
437437
return false;
438438
}
439439

indra/newview/skins/default/xui/en/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3970,7 +3970,8 @@ Abuse Report</string>
39703970
<string name="AvatarBirthDateFormatShort">[mthnum,datetime,slt]/[day,datetime,slt]</string>
39713971

39723972
<string name="DefaultMimeType">none/none</string>
3973-
<string name="texture_load_dimensions_error">Can't load images larger than [PIXELS] pixels</string>
3973+
<string name="texture_load_area_error">Can't load images larger than [PIXELS] pixels</string>
3974+
<string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string>
39743975
<string name="texture_load_format_error">Incorrect image format.</string>
39753976
<string name="texture_load_empty_file">File is empty.</string>
39763977
<string name="outfit_photo_load_dimensions_error">Max outfit photo size is [WIDTH]*[HEIGHT]. Please resize or use another image</string>

0 commit comments

Comments
 (0)