summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.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/lldrawable.h
parent12688c8b549d2baa33509dca60bbe14b039b17db (diff)
changed fast timer over to using macro
another attempt to move mem stat into base class
Diffstat (limited to 'indra/newview/lldrawable.h')
-rwxr-xr-xindra/newview/lldrawable.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index b94f663f21..3dab496a20 100755
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -61,7 +61,7 @@ const U32 SILHOUETTE_HIGHLIGHT = 0;
LL_ALIGN_PREFIX(16)
class LLDrawable
: public LLViewerOctreeEntryData,
- public LLTrace::MemTrackable<LLDrawable>
+ public LLTrace::MemTrackable<LLDrawable, 16>
{
public:
LLDrawable(const LLDrawable& rhs) : LLViewerOctreeEntryData(rhs)
@@ -291,7 +291,7 @@ public:
F32 mDistanceWRTCamera;
static F32 sCurPixelAngle; //current pixels per radian
- static LLTrace::MemStatHandle sMemStat;
+ //static LLTrace::MemStatHandle sMemStat;
private:
typedef std::vector<LLFace*> face_list_t;