1 files changed, 10 insertions, 0 deletions

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 11fda6d..3b7ae9d 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -143,6 +143,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                 if (!m_avatars.ContainsKey(agentId))
                     return false;
 
+            // FIXME: An extremely bad bit of code that reaches directly into the attachments list and manipulates it
+            List<SceneObjectGroup> attachments = sp.Attachments;
+            lock (attachments)
+            {
+                foreach (SceneObjectGroup att in attachments)
+                    scene.DeleteSceneObject(att, false);
+
+                attachments.Clear();
+            }
+
             AvatarAppearance npcAppearance = new AvatarAppearance(appearance, true);
             sp.Appearance = npcAppearance;
             sp.RezAttachments();