From 59e0c9be7137cfc9a6aec635acc9c0da9e854a24 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 26 Sep 2017 14:35:43 +0100
Subject: SL-800 - remove attachment pos overrides from avatar when an attached
 rigged mesh becomes an animated object

---
 indra/newview/llvovolume.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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);
+            }
         }
     }
 }
-- 
cgit v1.2.3