livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7504 WIP Force decloud after timeout using lower res textures 

Added more information into the texture debug view.
meow-7.2.2
Loren Shih 2010-06-02 14:27:10 -04:00
parent 7ea46b968c
commit b1514dc191
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/lltexlayer.cpp
View File

@ -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;
}

2
indra/newview/lltextureview.cpp
View File

@ -443,7 +443,7 @@ void LLAvatarTexBar::draw()
const std::string override_tex_discard_level_str = override_tex_discard_level ? llformat("%d",override_tex_discard_level) : "Disabled";
std::string header_text = llformat("[ Timeout('AvatarBakedTextureTimeout'):%s ] [ LOD_Override('TextureDiscardLevel'):%s ]", texture_timeout_str.c_str(), override_tex_discard_level_str.c_str());
LLFontGL::getFontMonospace()->renderUTF8(header_text, 0, 0, v_offset + line_height*line_num,
text_color, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT);
text_color, LLFontGL::LEFT, LLFontGL::TOP);
}
BOOL LLAvatarTexBar::handleMouseDown(S32 x, S32 y, MASK mask)