From 8fd836c29921fdf7c52d7ca99b9c88dd87f8a3c7 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 23 Aug 2014 12:03:55 +0100
Subject:  back to sending attachment sog kills in place of the hack. This is
 the  official way of doing it

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d471930..4632402 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5965,22 +5965,25 @@ namespace OpenSim.Region.Framework.Scenes
                 Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
         }
 
-        public void SendFullKillsTo(ScenePresence p)
+//  kill with attachs root kills
+        public void SendKillTo(ScenePresence p)
         {
-            List<uint> ids = new List<uint>();
-            foreach (SceneObjectGroup sog in m_attachments)
-                p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1);
+            List<uint> ids = new List<uint>(m_attachments.Count + 1);
             ids.Add(LocalId);
+            foreach (SceneObjectGroup sog in m_attachments)
+                ids.Add(sog.RootPart.LocalId);
             p.ControllingClient.SendKillObject(ids);
         }
 
+/*
+// kill with hack
         public void SendKillTo(ScenePresence p)
         {
             foreach (SceneObjectGroup sog in m_attachments)
                 p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1);
             p.ControllingClient.SendKillObject(new List<uint> { LocalId });
         }
-
+*/
         public void SendViewTo(ScenePresence p)
         {
             SendAvatarDataToAgentNF(p);
-- 
cgit v1.1