Merge branch 'master' into bulletsim

1 files changed, 11 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 719f2da..fc89473 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3509,12 +3509,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void RemoveAttachment(SceneObjectGroup gobj)
         {
             lock (m_attachments)
-            {
-                if (m_attachments.Contains(gobj))
-                {
-                    m_attachments.Remove(gobj);
-                }
-            }
+                m_attachments.Remove(gobj);
         }
 
         public bool ValidateAttachments()
@@ -3525,12 +3520,22 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (SceneObjectGroup gobj in m_attachments)
                 {
                     if (gobj == null)
+                    {
+                        m_log.WarnFormat(
+                            "[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null", Name);
                         return false;
+                    }
 
                     if (gobj.IsDeleted)
+                    {
+                        m_log.WarnFormat(
+                            "[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted",
+                            gobj.Name, gobj.UUID, Name);
                         return false;
+                    }
                 }
             }
+
             return true;
         }
 
@@ -3804,9 +3809,6 @@ namespace OpenSim.Region.Framework.Scenes
             List<AvatarAttachment> attachments = m_appearance.GetAttachments();
             foreach (AvatarAttachment attach in attachments)
             {
-                if (m_isDeleted)
-                    return;
-
                 int p = attach.AttachPoint;
                 UUID itemID = attach.ItemID;