diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-03 20:00:50 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-03 20:00:50 +0100 |
| commit | 7b5be21bfb92833a8cbccca6056251db55e2c90e (patch) | |
| tree | c2f39f2d290cfbda77d1617256cc060b2a64bf9e /indra/newview/lltexlayer.cpp | |
| parent | cd3e883ec439dbc6a3036ebdaebe6fb2257868b2 (diff) | |
| parent | e2b8c1c699f75e234776beda939205a247fb1bc3 (diff) | |
merge from 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 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; |