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 | 8cc9e29832f54660fbe174a70b656d32f46a094d (patch) | |
| tree | c2f39f2d290cfbda77d1617256cc060b2a64bf9e | |
| parent | 4d586d48ff3f6f10a159758af6dedccaf2e8543b (diff) | |
| parent | e2b8c1c699f75e234776beda939205a247fb1bc3 (diff) | |
merge from viewer-public
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lltexlayer.h | 4 |
2 files changed, 3 insertions, 3 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; diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h index 615de661af..2ee609fe60 100644 --- a/indra/newview/lltexlayer.h +++ b/indra/newview/lltexlayer.h @@ -322,9 +322,9 @@ protected: BOOL loadImageRaw(const std::string& file_name, LLImageRaw* image_raw); private: LLStringTable mImageNames; - typedef std::map<const char*, LLPointer<LLViewerTexture>> texture_map_t; + typedef std::map<const char*, LLPointer<LLViewerTexture> > texture_map_t; texture_map_t mStaticImageList; - typedef std::map<const char*, LLPointer<LLImageTGA>> image_tga_map_t; + typedef std::map<const char*, LLPointer<LLImageTGA> > image_tga_map_t; image_tga_map_t mStaticImageListTGA; S32 mGLBytes; S32 mTGABytes; |