Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapade

1 files changed, 0 insertions, 5 deletions

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index ad7124b5aa..186b01d60c 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -798,7 +798,6 @@ U8* LLImageBase::allocateDataSize(S32 width, S32 height, S32 ncomponents, S32 si
 // LLImageRaw
 //---------------------------------------------------------------------------
 
-S32 LLImageRaw::sGlobalRawMemory = 0;
 S32 LLImageRaw::sRawImageCount = 0;
 
 LLImageRaw::LLImageRaw()
@@ -856,16 +855,13 @@ LLImageRaw::~LLImageRaw()
 U8* LLImageRaw::allocateData(S32 size)
 {
 	U8* res = LLImageBase::allocateData(size);
-	sGlobalRawMemory += getDataSize();
 	return res;
 }
 
 // virtual
 U8* LLImageRaw::reallocateData(S32 size)
 {
-	sGlobalRawMemory -= getDataSize();
 	U8* res = LLImageBase::reallocateData(size);
-	sGlobalRawMemory += getDataSize();
 	return res;
 }
 
@@ -878,7 +874,6 @@ void LLImageRaw::releaseData()
 // virtual
 void LLImageRaw::deleteData()
 {
-	sGlobalRawMemory -= getDataSize();
 	LLImageBase::deleteData();
 }