From 5ec8bbbe2244ea70d8aa74b5c572351632699425 Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Wed, 10 Oct 2007 00:01:43 +0000 Subject: svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 --- indra/newview/lltexturectrl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/lltexturectrl.cpp') diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 2d013e04fb..b961053799 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -344,13 +344,12 @@ void LLFloaterTexturePicker::updateImageStats() //RN: have we received header data for this image? if (mTexturep->getWidth(0) > 0 && mTexturep->getHeight(0) > 0) { - std::ostringstream formatted_dims; - formatted_dims << llformat("Dimensions: %d x %d", mTexturep->getWidth(0),mTexturep->getHeight(0)); - mResolutionLabel->setText(formatted_dims.str()); + LLString formatted_dims = llformat("%d x %d", mTexturep->getWidth(0),mTexturep->getHeight(0)); + mResolutionLabel->setTextArg("[DIMENSIONS]", formatted_dims); } else { - mResolutionLabel->setText("Dimensions: unknown"); + mResolutionLabel->setTextArg("[DIMENSIONS]", LLString("[? x ?]")); } if (gAgent.isGodlike()) { @@ -1454,3 +1453,4 @@ BOOL LLToolTexEyedropper::handleHover(S32 x, S32 y, MASK mask) return TRUE; } + -- cgit v1.2.3