diff options
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rw-r--r-- | indra/newview/lldrawable.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 14d782d6f2..9a9f6cf7c2 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -59,14 +59,15 @@ const U32 SILHOUETTE_HIGHLIGHT = 0; // All data for new renderer goes into this class. LL_ALIGN_PREFIX(16) -class LLDrawable -: public LLViewerOctreeEntryData, - public LLTrace::MemTrackable<LLDrawable, 16> +class LLDrawable + : public LLViewerOctreeEntryData { + LL_ALIGN_NEW; public: + typedef std::vector<LLFace*> face_list_t; + LLDrawable(const LLDrawable& rhs) - : LLTrace::MemTrackable<LLDrawable, 16>("LLDrawable"), - LLViewerOctreeEntryData(rhs) + : LLViewerOctreeEntryData(rhs) { *this = rhs; } @@ -130,6 +131,7 @@ public: inline LLFace* getFace(const S32 i) const; inline S32 getNumFaces() const; + face_list_t& getFaces() { return mFaces; } //void removeFace(const S32 i); // SJB: Avoid using this, it's slow LLFace* addFace(LLFacePool *poolp, LLViewerTexture *texturep); @@ -298,8 +300,6 @@ public: static F32 sCurPixelAngle; //current pixels per radian private: - typedef std::vector<LLFace*> face_list_t; - U32 mState; S32 mRenderType; LLPointer<LLViewerObject> mVObjp; |