summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-09-05 14:21:57 -0700
committerRichard Linden <none@none>2013-09-05 14:21:57 -0700
commit9dc6478544711b1f03c9f7010421f9c8ebbbe008 (patch)
tree1d28248570ac6e48596c787734bc39a891d9752e /indra/llimage/llimage.cpp
parent736efc7b574635d5c86a97a33b456dd79a035777 (diff)
parentcbe397ad13665c7bc993e10d8fe1e4a876253378 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llimage/llimage.cpp')
-rwxr-xr-xindra/llimage/llimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 7a46f47473..bb4253a9f5 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -50,7 +50,7 @@ LLMutex* LLImage::sMutex = NULL;
bool LLImage::sUseNewByteRange = false;
S32 LLImage::sMinimalReverseByteRangePercent = 75;
LLPrivateMemoryPool* LLImageBase::sPrivatePoolp = NULL ;
-LLTrace::MemStatHandle LLImageBase::sMemStat("LLImage");
+//LLTrace::MemStatHandle LLImageBase::sMemStat("LLImage");
//static
void LLImage::initClass(bool use_new_byte_range, S32 minimal_reverse_byte_range_percent)