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

SL-19929 Picker's warning small adjustment

meow-7.2.2
Andrey Kleshchev 2023-06-30 00:42:55 +03:00
parent f149b87fcc
commit ab18293d35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lltexturectrl.cpp
View File

@ -288,7 +288,7 @@ bool LLFloaterTexturePicker::updateImageStats()
|| height > mMaxDim
)
{
std::string formatted_dims = llformat("%d x %d", width, height);
std::string formatted_dims = llformat("%dx%d", width, height);
mResolutionWarning->setTextArg("[TEXDIM]", formatted_dims);
result = false;
}
@ -1155,9 +1155,9 @@ void LLFloaterTexturePicker::setDimentionsLimits(S32 max_dim, S32 min_dim)
mMaxDim = max_dim;
mMinDim = min_dim;
std::string formatted_dims = llformat("%d x %d", mMinDim, mMinDim);
std::string formatted_dims = llformat("%dx%d", mMinDim, mMinDim);
mResolutionWarning->setTextArg("[MINTEXDIM]", formatted_dims);
formatted_dims = llformat("%d x %d", mMaxDim, mMaxDim);
formatted_dims = llformat("%dx%d", mMaxDim, mMaxDim);
mResolutionWarning->setTextArg("[MAXTEXDIM]", formatted_dims);
}

2
indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
View File

@ -96,7 +96,7 @@
name="over_limit_lbl"
visible="false"
top_delta="0">
Selected texture is [TEXDIM], inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
Selected texture is [TEXDIM]. Inventory image must be square, between [MINTEXDIM] and [MAXTEXDIM].
</text>
<!-- middle: inventory mode -->