diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 06639835d7..7087bb79e7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5411,7 +5411,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (data.ParentGroup.IsAttachment)
             {
-                if (data.UUID == data.ParentGroup.RootPart.UUID)
+                if (data.IsRoot)
                 {
                     update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID);
                 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4fa95fddba..58d3ef6f6c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5982,10 +5982,10 @@ namespace OpenSim.Region.Framework.Scenes
         public void SendKillTo(ScenePresence p)
         {
             List<uint> ids = new List<uint>(m_attachments.Count + 1);
-            foreach (SceneObjectGroup sog in m_attachments)
-            {
-                ids.Add(sog.RootPart.LocalId);
-            }
+//            foreach (SceneObjectGroup sog in m_attachments)
+//            {
+//                ids.Add(sog.RootPart.LocalId);
+//            }
 
             ids.Add(LocalId);
             p.ControllingClient.SendKillObject(ids);