From d69f1e18a7838fc2301c39e5b7a2a01b987c94f6 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 25 Sep 2017 21:56:40 +0100 Subject: MAINT-7819 - fix for gratuitous extra extended mesh flag setting --- indra/newview/llvovolume.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview') 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; -- cgit v1.2.3