diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-31 19:03:23 +0300 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-31 19:03:23 +0300 |
commit | 3517393b4c9949e62e1eca866e449e463e7a090e (patch) | |
tree | ffa886f3c83de5c830155c0a11216e605665dcb5 /indra/newview/lltextureview.h | |
parent | 95fad9ce8633ea26b7fb7ca2badbf20e68dd8f9d (diff) | |
parent | 40b476dbb2aee494d57dce81427b74ac19b1428d (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltextureview.h')
-rw-r--r-- | indra/newview/lltextureview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltextureview.h b/indra/newview/lltextureview.h index 435a55df83..dfd9c42c2c 100644 --- a/indra/newview/lltextureview.h +++ b/indra/newview/lltextureview.h @@ -38,11 +38,13 @@ class LLViewerFetchedTexture; class LLTextureBar; class LLGLTexMemBar; +class LLAvatarTexBar; class LLTextureView : public LLContainerView { friend class LLTextureBar; friend class LLGLTexMemBar; + friend class LLAvatarTexBar; protected: LLTextureView(const Params&); friend class LLUICtrlFactory; @@ -73,7 +75,7 @@ private: U32 mNumTextureBars; LLGLTexMemBar* mGLTexMemBar; - + LLAvatarTexBar* mAvatarTexBar; public: static std::set<LLViewerFetchedTexture*> sDebugImages; }; |