livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2025.06' of https://github.com/secondlife/viewer

master
Ansariel 2025-08-14 20:37:09 +02:00
parent c40e58fd04 479618097b
commit af5ba4b6b4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterimagepreview.cpp
View File

@ -614,7 +614,7 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
LLStringUtil::format_map_t args;
args["PIXELS"] = llformat("%dM", (S32)(MAX_IMAGE_AREA / 1000000));
mImageLoadError = LLTrans::getString("texture_load_dimensions_error", args);
mImageLoadError = LLTrans::getString("texture_load_area_error", args);
return false;
}

3
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2495,7 +2495,8 @@ Abuse Report</string>
<string name="AvatarBirthDateFormat_legacy">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
<string name="DefaultMimeType">none/none</string>
<string name="texture_load_dimensions_error">Can't load images larger than [PIXELS] pixels</string>
<string name="texture_load_area_error">Can't load images larger than [PIXELS] pixels</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>