diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-09-25 21:56:40 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-09-25 21:56:40 +0100 |
| commit | d69f1e18a7838fc2301c39e5b7a2a01b987c94f6 (patch) | |
| tree | b5f6d31044d6614c85272d7b2ed49cfd4a78015b /indra/newview | |
| parent | 8c38fc7b5661feb180de9a0a9ccbdadbd2af9f37 (diff) | |
MAINT-7819 - fix for gratuitous extra extended mesh flag setting
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index e660a4c4a6..0b338a81a5 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3439,12 +3439,14 @@ void LLVOVolume::updateAnimatedObjectState(LLViewerObject *old_parent, LLViewerO // we may want to include or remove the isAvatar() check. if (new_parent && !new_parent->isAvatar()) { +#if 0 // AXON - MAINT-7819 // Object should inherit control avatar and animated mesh flag // from parent, so clear them out from our own state if (getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG) { setExtendedMeshFlags(getExtendedMeshFlags() & ~LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG); } +#endif if (mControlAvatar.notNull()) { LLControlAvatar *av = mControlAvatar; |