summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-07-19 22:21:08 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-07-19 22:21:08 +0100
commit5610444d6450d5eb2e203be527116fe01d2d436a (patch)
tree8cab2d96488ff102fcc81fedd6a63c1737483362 /indra/newview/lldrawable.cpp
parent6837ca5cd899d0aba71f856f540b535a7fc78595 (diff)
SL-714 - fixes to get wireframes to display consistently when right-clicking on animated objects.
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index f956023358..61ebf947dd 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -550,7 +550,8 @@ void LLDrawable::makeStatic(BOOL warning_enabled)
if (isState(ACTIVE) &&
!isState(ACTIVE_CHILD) &&
!mVObjp->isAttachment() &&
- !mVObjp->isFlexible())
+ !mVObjp->isFlexible() &&
+ !mVObjp->isAnimatedObject())
{
clearState(ACTIVE | ANIMATED_CHILD);