diff options
| author | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
| commit | c6b6ae7a45f7ab473dd839515a1717bae68af03a (patch) | |
| tree | 74bc548852a9ea3cf350096b55182761362a3f6d /indra/newview/lldrawable.h | |
| parent | 3fd68662f267a3fd96d101834b3a9563bde3f61e (diff) | |
| parent | e4cacda5a0cf3918bdc8091997b988235e9d4f3d (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rwxr-xr-x | indra/newview/lldrawable.h | 4 |
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; |