diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index ec0ae395734a97695eef8bc81044bae65ffbc073..21bb85570421cba4d9d4907ad3dc2d16173c9c0d 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 dc68bd0d4a29955122c771f03f4963d18e85e10a..771113d98995bd55ac47bcbc3fcef970080b81fd 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 -->