diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-06-30 00:42:55 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-06-30 00:42:55 +0300 |
| commit | ab18293d35c4ce391f65efaa65be53cdbe84f550 (patch) | |
| tree | ae501c08c6a5c25cd068a8ab9255c8f9f5622275 | |
| parent | f149b87fcc152a7e6232d1a2eb81bb2ac72697da (diff) | |
SL-19929 Picker's warning small adjustment
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index ec0ae39573..21bb855704 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -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); } diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index dc68bd0d4a..771113d989 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -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 --> |