summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-03 20:00:11 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-03 20:00:11 +0100
commite2b8c1c699f75e234776beda939205a247fb1bc3 (patch)
tree625a28f4553ee3249f04ab7496bf538a2900e05d /indra
parent826c4c50d62a8316c218f01a94abfbdcdd1ca12f (diff)
parent78e017c881a89d7f7fed798a994c318c8129cccb (diff)
merge
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 2c019aa6a4..1d74a7be8c 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -326,7 +326,7 @@ BOOL LLTexLayerSetBuffer::isReadyToUpload() const
{
// The timeout period increases exponentially between every lowres upload in order to prevent
// spamming the server with frequent uploads.
- const U32 texture_timeout_threshold = texture_timeout*pow((F32)2.0,(F32)mNumLowresUploads);
+ const U32 texture_timeout_threshold = texture_timeout*(1 << mNumLowresUploads);
// If we hit our timeout and have textures available at even lower resolution, then upload.
const BOOL is_upload_textures_timeout = mNeedsUploadTimer.getElapsedTimeF32() >= texture_timeout_threshold;