summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-05-24 18:38:03 +0000
committerDave Parks <davep@lindenlab.com>2022-05-24 18:38:03 +0000
commit7fb07008fc1ab2b7a6d8da3d7079cf0fafda9928 (patch)
tree311d04d5aca4a4ab6d0660a6bd5af2fb7bd5e45b /indra/llimage/llimage.cpp
parent3365a39080744af0566adb7b6efd8e53fc6b3339 (diff)
parent9f9465f5bd2160f0245805e32644ce37f8c6cca6 (diff)
Merged in SL-17219 (pull request #992)
SL-17219
Diffstat (limited to 'indra/llimage/llimage.cpp')
-rw-r--r--indra/llimage/llimage.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 0fa027c9c3..3a3011d99b 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()
@@ -847,16 +846,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;
}
@@ -869,7 +865,6 @@ void LLImageRaw::releaseData()
// virtual
void LLImageRaw::deleteData()
{
- sGlobalRawMemory -= getDataSize();
LLImageBase::deleteData();
}