diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 2c019aa6a40bfbe1a58fbd3b48b104ff56b58ff8..1d74a7be8c6043332bc2891a2f58d47023290e90 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 615de661af7daa7d5c2ca2b9159ca5f4bb4f259e..2ee609fe600cf6bc5e6662ba217a9d829be3c455 100644
--- a/indra/newview/lltexlayer.h
+++ b/indra/newview/lltexlayer.h
@@ -322,9 +322,9 @@ class LLTexLayerStaticImageList : public LLSingleton<LLTexLayerStaticImageList>
 	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;