summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-01-04 14:09:02 -0800
committerRichard Linden <none@none>2013-01-04 14:09:02 -0800
commit4ebd4b3616d9d69e9b6deb73aa1f1e16f5673225 (patch)
tree1e9b82b7366d3465d357233320e5e3bae940f5b2
parentcbff0e7ab8afeebb6ddab854d35ea12ef9a9930a (diff)
SH-3468 WIP add memory tracking base class
further compile error fixes
-rw-r--r--indra/llimage/llimage.cpp2
-rw-r--r--indra/newview/llviewerobject.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 56f6b0964c..f3452ce86a 100644
--- 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::MemStat LLImage::sMemStat("LLImage");
+LLTrace::MemStat LLImageBase::sMemStat("LLImage");
//static
void LLImage::initClass(bool use_new_byte_range, S32 minimal_reverse_byte_range_percent)
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 153f44601c..bdff88f8ca 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -634,7 +634,8 @@ public:
LLPointer<LLHUDText> mText;
LLPointer<LLHUDIcon> mIcon;
- static BOOL sUseSharedDrawables;
+ static BOOL sUseSharedDrawables;
+ static LLTrace::MemStat sMemStat;
protected:
// delete an item in the inventory, but don't tell the
@@ -748,7 +749,6 @@ protected:
static S32 sAxisArrowLength;
- static LLTrace::MemStat sMemStat;
// These two caches are only correct for non-parented objects right now!
mutable LLVector3 mPositionRegion;