summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-02 14:27:10 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-02 14:27:10 -0400
commitb1514dc19108320fa7d9ecb2879c96bcdc401605 (patch)
treeff8b8a98b562b57f10ae5919d45b0e0a43695907 /indra/newview/lltexlayer.cpp
parent7ea46b968cf7df3afc1e879f90f1124157f5a79d (diff)
EXT-7504 WIP Force decloud after timeout using lower res textures
Added more information into the texture debug view.
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r--indra/newview/lltexlayer.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index b13f9e3898..0c3c052fe3 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -434,14 +434,14 @@ void LLTexLayerSetBuffer::readBackAndUpload()
if (highest_lod)
{
- // Got the final LOD for the baked texture.
+ // Sending the final LOD for the baked texture.
// All done, pause the upload timer so we know how long it took.
mNeedsUpload = FALSE;
mNeedsUploadTimer.pause();
}
else
{
- // Got a lower level LOD for the baked texture.
+ // Sending a lower level LOD for the baked texture.
// Restart the upload timer.
mDebugNumLowresUploads++;
mNeedsUploadTimer.unpause();
@@ -2243,9 +2243,11 @@ const std::string LLTexLayerSetBuffer::dumpTextureInfo() const
const BOOL is_high_res = !mNeedsUpload;
const U32 num_low_res = mDebugNumLowresUploads;
const U32 upload_time = (U32)mNeedsUploadTimer.getElapsedTimeF32();
+ const BOOL is_uploaded = !mUploadPending;
const std::string local_texture_info = gAgentAvatarp->debugDumpLocalTextureDataInfo(mTexLayerSet);
- std::string text = llformat("[ HiRes:%d LoRes:%d Timer:%d ] %s",
- is_high_res, num_low_res, upload_time,
+ std::string text = llformat("[ HiRes:%d LoRes:%d Uploaded:%d ] [ Timer:%d ] %s",
+ is_high_res, num_low_res, is_uploaded,
+ upload_time,
local_texture_info.c_str());
return text;
}