diff options
author | Richard Linden <none@none> | 2012-12-18 00:58:26 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-12-18 00:58:26 -0800 |
commit | 1f56e57008f5a50c9e75fc0b4512c483ac359a52 (patch) | |
tree | 6631b12beaf3cf64e093730e9c93df34b883472c /indra/newview/lldrawable.h | |
parent | 8c2e3bea71ea15b805a9e2a288744f10d195d803 (diff) |
SH-3468 WIP add memory tracking base class
created memory tracking trace type
instrumented a few classes with memory tracking
Diffstat (limited to 'indra/newview/lldrawable.h')
-rw-r--r-- | indra/newview/lldrawable.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 4608d16fec..f15090fb87 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -59,7 +59,9 @@ const U32 SILHOUETTE_HIGHLIGHT = 0; // All data for new renderer goes into this class. LL_ALIGN_PREFIX(16) -class LLDrawable : public LLRefCount +class LLDrawable +: public LLRefCount, + public LLTrace::MemTrackable<LLDrawable> { public: LLDrawable(const LLDrawable& rhs) @@ -316,24 +318,23 @@ public: private: typedef std::vector<LLFace*> face_list_t; - U32 mState; - S32 mRenderType; - LLPointer<LLViewerObject> mVObjp; - face_list_t mFaces; - LLSpatialGroup* mSpatialGroupp; - LLPointer<LLDrawable> mSpatialBridge; + U32 mState; + S32 mRenderType; + LLPointer<LLViewerObject> mVObjp; + face_list_t mFaces; + LLSpatialGroup* mSpatialGroupp; + LLPointer<LLDrawable> mSpatialBridge; - mutable U32 mVisible; - F32 mRadius; - F32 mBinRadius; - mutable S32 mBinIndex; - S32 mGeneration; - - LLVector3 mCurrentScale; - - static U32 sCurVisible; // Counter for what value of mVisible means currently visible + mutable U32 mVisible; + F32 mRadius; + F32 mBinRadius; + mutable S32 mBinIndex; + S32 mGeneration; - static U32 sNumZombieDrawables; + LLVector3 mCurrentScale; + + static U32 sCurVisible; // Counter for what value of mVisible means currently visible + static U32 sNumZombieDrawables; static LLDynamicArrayPtr<LLPointer<LLDrawable> > sDeadList; } LL_ALIGN_POSTFIX(16); |