diff options
| author | Aura Linden <aura@lindenlab.com> | 2012-08-17 08:07:15 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2012-08-17 08:07:15 -0700 |
| commit | efdcf045b064335aa180f03bae58916af19e2169 (patch) | |
| tree | 4ca0be04bf1688b728b40be0d6b4221956127918 /indra/newview/llviewertextureanim.h | |
| parent | 56298eed3d8ae586ab2ae4c7b8dcf53eeede7394 (diff) | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
Merged in from viewer-development.
Diffstat (limited to 'indra/newview/llviewertextureanim.h')
| -rw-r--r-- | indra/newview/llviewertextureanim.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llviewertextureanim.h b/indra/newview/llviewertextureanim.h index dd7bd0cb90..abbfabceb9 100644 --- a/indra/newview/llviewertextureanim.h +++ b/indra/newview/llviewertextureanim.h @@ -30,10 +30,18 @@ #include "lltextureanim.h" #include "llframetimer.h" +class LLVOVolume; + class LLViewerTextureAnim : public LLTextureAnim { +private: + static std::vector<LLViewerTextureAnim*> sInstanceList; + S32 mInstanceIndex; + public: - LLViewerTextureAnim(); + static void updateClass(); + + LLViewerTextureAnim(LLVOVolume* vobj); virtual ~LLViewerTextureAnim(); /*virtual*/ void reset(); @@ -51,6 +59,7 @@ public: F32 mRot; protected: + LLVOVolume* mVObj; LLFrameTimer mTimer; F64 mLastTime; F32 mLastFrame; |