summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-04 14:17:13 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-04 14:17:13 -0400
commitcfc98d7e374d0e9a236ed4e1bd78faeecfb5ba2a (patch)
tree6c69fe88211eaa4d2d38ebc5860a78457661a9fc /indra/newview/lltexlayer.cpp
parentf457eaf67d60c8e526ae19950e4cc67fa290c2bb (diff)
EXT-7526 WIP Add baked texture information to texture view
Minor logic fix for status display.
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r--indra/newview/lltexlayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 1847ebb456..871231a1f5 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -2289,8 +2289,8 @@ const std::string LLTexLayerSetBuffer::dumpTextureInfo() const
const U32 upload_time = (U32)mNeedsUploadTimer.getElapsedTimeF32();
const std::string local_texture_info = gAgentAvatarp->debugDumpLocalTextureDataInfo(mTexLayerSet);
std::string status = "CREATING ";
- if (mUploadPending) status = "UPLOADING";
if (!mNeedsUpload) status = " DONE ";
+ if (mUploadPending) status = "UPLOADING";
std::string text = llformat("[ %s ] [ HiRes:%d LoRes:%d ] [ Timer:%d ] %s",
status.c_str(),
is_high_res, num_low_res,