diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-02 11:09:17 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-02 11:09:17 -0700 |
| commit | 28d23e8c85ba6073cffbd3597342c43f4f9c7971 (patch) | |
| tree | 8e817fa78c67ffe686d57f4889016623dfeffab2 /indra/newview/lltextureview.h | |
| parent | b742f0c2a4cf1355044fbcebdad4346a4871a89b (diff) | |
| parent | 4835c615d5a00f146bcd5c7a50153418ce2a3613 (diff) | |
Merge
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; }; |