summaryrefslogtreecommitdiff
path: root/indra/newview/llvocache.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-09-05 14:04:13 -0700
committerRichard Linden <none@none>2013-09-05 14:04:13 -0700
commitcbe397ad13665c7bc993e10d8fe1e4a876253378 (patch)
tree52cd665a1138a65bd8ebfc94478c665ea40b2e25 /indra/newview/llvocache.h
parent12688c8b549d2baa33509dca60bbe14b039b17db (diff)
changed fast timer over to using macro
another attempt to move mem stat into base class
Diffstat (limited to 'indra/newview/llvocache.h')
-rwxr-xr-xindra/newview/llvocache.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
index 52b25b7f91..1fa019cfa6 100755
--- a/indra/newview/llvocache.h
+++ b/indra/newview/llvocache.h
@@ -37,7 +37,9 @@
// Cache entries
class LLCamera;
-class LLVOCacheEntry : public LLViewerOctreeEntryData
+class LLVOCacheEntry
+: public LLViewerOctreeEntryData,
+ public LLTrace::MemTrackable<LLVOCacheEntry, 16>
{
public:
enum //low 16-bit state
@@ -174,7 +176,7 @@ public:
public:
static BOOL sNeedsOcclusionCheck;
- static LLTrace::MemStatHandle sMemStat;
+ //static LLTrace::MemStatHandle sMemStat;
private:
BOOL mDirty;