summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-05-28 15:01:22 -0400
committerLoren Shih <seraph@lindenlab.com>2010-05-28 15:01:22 -0400
commitdf853b1066f40441c89e6b6d536b54d4525b8347 (patch)
treed05a0473f6acf85c517b880de5bee223562f2f3a /indra
parentb7bfc3ae7a7934676b217e0c1fe24ce821ab4649 (diff)
Fix for compile error in lltexlayer.cpp
Diffstat (limited to 'indra')
-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 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,