From acfdca34fd9bf6d66d144ae5c0a325dd5e864517 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 17 Aug 2011 01:35:33 +0100
Subject: Fix issue where loading a new appearance onto an NPC would not remove
 the previous attachments from the scene.

Addresses http://opensimulator.org/mantis/view.php?id=5636
---
 .../Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs |  4 ++--
 OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs      |  3 ++-
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs          | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 4dbc5e6..0316d29 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <param name="silent"></param>
         public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
         {
-            m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
+//            m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
 
             try
             {
@@ -466,7 +466,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     {
                         m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero);
                         group.DetachToInventoryPrep();
-                        m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString());
+//                        m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString());
 
                         // If an item contains scripts, it's always changed.
                         // This ensures script state is saved on detach
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 6cc64c6..4cb3df2 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -96,9 +96,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <summary>
         /// Detach an object from the avatar.
         /// </summary>
-        ///
+        /// <remarks>
         /// This method is called in response to a client's detach request, so we only update the information in
         /// inventory
+        /// </remarks>
         /// <param name="objectLocalID"></param>
         /// <param name="remoteClient"></param>
         void DetachObject(uint objectLocalID, IClientAPI remoteClient);
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();
-- 
cgit v1.1