diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2010-04-09 23:49:11 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2010-04-09 23:49:11 -0600 |
commit | 0a80627bca63ee05ce07df510ebe2072399dd01d (patch) | |
tree | 8af963a46af857daabc0a24f3aefe36ee141a09e /indra/newview/llfloateranimpreview.cpp | |
parent | 55ea80076bafcd1baf6a8ccf713267b8c2c24185 (diff) | |
parent | d64ccab573e9455815dede58f8027a8f2337a728 (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
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 5ec58c8dd6..72dc182461 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -1069,6 +1069,12 @@ LLPreviewAnimation::~LLPreviewAnimation() mDummyAvatar->markDead(); } +//virtual +S8 LLPreviewAnimation::getType() const +{ + return LLViewerDynamicTexture::LL_PREVIEW_ANIMATION ; +} + //----------------------------------------------------------------------------- // update() //----------------------------------------------------------------------------- |