diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-28 20:44:59 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-28 20:44:59 +0100 |
| commit | 66186ea81fd192e1ec88e0ea879af44726c0ea57 (patch) | |
| tree | a95c9c8dd730141e7164c741b5e4d9b5f8fce6fa /indra/newview/lltexlayer.cpp | |
| parent | 12eb078c16b918110e21c5c320e2b76cfc871492 (diff) | |
| parent | a5c9e30fc806cc8cf291b7da0fd4133ca8241fed (diff) | |
Merged from ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 8c733ab558..3f3aefa4b5 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -2241,7 +2241,7 @@ const std::string LLTexLayerSetBuffer::dumpTextureInfo() const const BOOL is_high_res = !mNeedsUpload; const BOOL is_low_res = !mNeedsLowResUpload; - const U32 upload_time = mNeedsUploadTimer.getElapsedTimeF32(); + const U32 upload_time = (U32)mNeedsUploadTimer.getElapsedTimeF32(); const std::string local_texture_info = gAgentAvatarp->debugDumpLocalTextureDataInfo(mTexLayerSet); std::string text = llformat("[ HiRes:%d LoRes:%d Timer:%d ] %s", is_high_res, is_low_res, upload_time, |