diff options
| author | Richard Linden <none@none> | 2013-10-07 13:38:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-07 13:38:48 -0700 |
| commit | 2eeee8a9491398697a8f3167bc4f715a3970fc3a (patch) | |
| tree | 1ec811f4a0529edc415c32fb7ec3e6a9406cff2f /indra/llrender | |
| parent | c430673b95823f688c45d0fbda4198595bb41073 (diff) | |
| parent | 17df8988fec3f2ba991ca9e34ff8148253a2fc04 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/lltexture.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llrender/lltexture.h b/indra/llrender/lltexture.h index ff711b8004..9fca8b8cd3 100755 --- a/indra/llrender/lltexture.h +++ b/indra/llrender/lltexture.h @@ -33,6 +33,8 @@ #define LL_TEXTURE_H #include "llrefcount.h" +#include "lltrace.h" + class LLImageGL ; class LLTexUnit ; class LLFontGL ; @@ -40,7 +42,7 @@ class LLFontGL ; // //this is an abstract class as the parent for the class LLGLTexture // -class LLTexture : public virtual LLRefCount +class LLTexture : public virtual LLRefCount, public LLTrace::MemTrackable<LLTexture> { friend class LLTexUnit ; friend class LLFontGL ; @@ -49,7 +51,9 @@ protected: virtual ~LLTexture(); public: - LLTexture(){} + LLTexture() + : LLTrace::MemTrackable<LLTexture>("LLTexture") + {} // //interfaces to access LLGLTexture |