1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 0b338a81a5..e8122c0748 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3343,6 +3343,11 @@ void LLVOVolume::setExtendedMeshFlags(U32 flags)
         if (isAttachment() && getAvatarAncestor())
         {
             getAvatarAncestor()->updateVisualComplexity();
+            if (flags & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG)
+            {
+                // Making a rigged mesh into an animated object
+                getAvatarAncestor()->removeAttachmentOverridesForObject(this);
+            }
         }
     }
 }