aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltexturectrl.cpp')
-rw-r--r--linden/indra/newview/lltexturectrl.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 9c64bd3..b961053 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -3,6 +3,8 @@
3 * @author Richard Nelson, James Cook 3 * @author Richard Nelson, James Cook
4 * @brief LLTextureCtrl class implementation including related functions 4 * @brief LLTextureCtrl class implementation including related functions
5 * 5 *
6 * $LicenseInfo:firstyear=2002&license=viewergpl$
7 *
6 * Copyright (c) 2002-2007, Linden Research, Inc. 8 * Copyright (c) 2002-2007, Linden Research, Inc.
7 * 9 *
8 * Second Life Viewer Source Code 10 * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
25 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 27 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
26 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 28 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27 * COMPLETENESS OR PERFORMANCE. 29 * COMPLETENESS OR PERFORMANCE.
30 * $/LicenseInfo$
28 */ 31 */
29 32
30#include "llviewerprecompiledheaders.h" 33#include "llviewerprecompiledheaders.h"
@@ -341,13 +344,12 @@ void LLFloaterTexturePicker::updateImageStats()
341 //RN: have we received header data for this image? 344 //RN: have we received header data for this image?
342 if (mTexturep->getWidth(0) > 0 && mTexturep->getHeight(0) > 0) 345 if (mTexturep->getWidth(0) > 0 && mTexturep->getHeight(0) > 0)
343 { 346 {
344 std::ostringstream formatted_dims; 347 LLString formatted_dims = llformat("%d x %d", mTexturep->getWidth(0),mTexturep->getHeight(0));
345 formatted_dims << llformat("Dimensions: %d x %d", mTexturep->getWidth(0),mTexturep->getHeight(0)); 348 mResolutionLabel->setTextArg("[DIMENSIONS]", formatted_dims);
346 mResolutionLabel->setText(formatted_dims.str());
347 } 349 }
348 else 350 else
349 { 351 {
350 mResolutionLabel->setText("Dimensions: unknown"); 352 mResolutionLabel->setTextArg("[DIMENSIONS]", LLString("[? x ?]"));
351 } 353 }
352 if (gAgent.isGodlike()) 354 if (gAgent.isGodlike())
353 { 355 {
@@ -1451,3 +1453,4 @@ BOOL LLToolTexEyedropper::handleHover(S32 x, S32 y, MASK mask)
1451 return TRUE; 1453 return TRUE;
1452} 1454}
1453 1455
1456