diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-13 12:09:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-13 12:09:04 -0400 |
| commit | f5e35cbc5362f6b83fcccabf6b22374ca6f08d42 (patch) | |
| tree | de1746f9e607d05b535523a3179ece971edd61ba /indra/newview/llviewertextureanim.h | |
| parent | 0664cb1512481b9cd9f5ef4bc398c88416b246a9 (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
Merge 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; |