diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index e4536183e9..31eb319eb3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -179,12 +179,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 UUID itemID = UUID.Zero;
                 if (sp != null)
                 {
-                    foreach (SceneObjectGroup grp in sp.GetAttachments(AttachmentPt))
+                    foreach(SceneObjectGroup grp in sp.Attachments)
                     {
-                        itemID = grp.GetFromItemID();
-                        if (itemID != UUID.Zero)
-                            DetachSingleAttachmentToInv(itemID, remoteClient);
+                        if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
+                        {
+                            itemID = grp.GetFromItemID();
+                            break;
+                        }
                     }
+                    if (itemID != UUID.Zero)
+                        DetachSingleAttachmentToInv(itemID, remoteClient);
                 }
 
                 if (group.GetFromItemID() == UUID.Zero)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ae48c0289d..e3f06938fb 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5165,6 +5165,7 @@ namespace OpenSim.Region.Framework.Scenes
                         });
             }
 
+<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
             if (objectsToDelete.Count > 0)
             {
                 m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count);
@@ -5174,6 +5175,12 @@ namespace OpenSim.Region.Framework.Scenes
                     DeleteSceneObject(grp, true);
                 }
                 m_log.Debug("[SCENE]: Finished dropped attachment deletion");
+=======
+            foreach (SceneObjectGroup grp in objectsToDelete)
+            {
+                m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
+                DeleteSceneObject(grp, true);
+>>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs
             }
         }
     }