diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-13 20:50:38 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-13 20:50:38 +0100 |
| commit | 99effd37ab6cc6611f75cdca9146cc3c46a86482 (patch) | |
| tree | 36b2d122e915b43791231854a6652583d1ca276b /indra/newview/llvovolume.cpp | |
| parent | a4d1600a79ea9118bcbe854a55f7491d738b844c (diff) | |
SL-714 - pause animations when animated objects are right clicked, generate rigged volume for wireframe.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 4065f9fc37..d661837ddd 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4269,9 +4269,9 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& bool LLVOVolume::treatAsRigged() { return isSelected() && - isAttachment() && - mDrawable.notNull() && - mDrawable->isState(LLDrawable::RIGGED); + (isAttachment() || isAnimatedObject()) && + mDrawable.notNull() && + mDrawable->isState(LLDrawable::RIGGED); } LLRiggedVolume* LLVOVolume::getRiggedVolume() |