diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-12 11:55:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-12 11:55:54 +0100 |
| commit | f8f1e30ac385906230ef0532c0a68aff293de4cb (patch) | |
| tree | ff932bd127278e8d6fd6f9f29056b8c89dc8260c /indra/newview/llfloateranimpreview.cpp | |
| parent | e9a94a04ff3562742c52bba45b8377fce9eeaad6 (diff) | |
| parent | d6996c7d3da4ddbb81a7758e508c1aa477d4edc4 (diff) | |
slightly-hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llfloateranimpreview.cpp')
| -rw-r--r-- | indra/newview/llfloateranimpreview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp index 7dcf4350aa..07551e0290 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -1070,6 +1070,12 @@ LLPreviewAnimation::~LLPreviewAnimation() mDummyAvatar->markDead(); } +//virtual +S8 LLPreviewAnimation::getType() const +{ + return LLViewerDynamicTexture::LL_PREVIEW_ANIMATION ; +} + //----------------------------------------------------------------------------- // update() //----------------------------------------------------------------------------- |