From c7dd7b13a2058fa6855e2e78f1dbb83e9a806f95 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 6 Nov 2011 20:38:07 +0000
Subject: Convert SendKillObject to take a list of uint rather than sending one
 packet per prim. More to come as we change to make use of this.

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs      | 2 +-
 .../Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index de99b94..2349e40 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -548,7 +548,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 //
                 if (so.IsSelected)
                 {
-                    m_scene.SendKillObject(so.RootPart.LocalId);
+                    m_scene.SendKillObject(new List<uint> { so.RootPart.LocalId });
                 }
 
                 so.IsSelected = false; // fudge....
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 7251bd8..d01f89b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected void KillEntity(Scene scene, uint localID)
         {
-            scene.SendKillObject(localID);
+            scene.SendKillObject(new List<uint> { localID });
         }
 
         protected virtual GridRegion GetFinalDestination(GridRegion region)
-- 
cgit v1.1