* refactor: rename SendKiPrimitive to SendKillObject since this appears more descriptive of what it actually does

4 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
index ff9423f..edf5ec1 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
                     // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles.
                     ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup();
                     scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
-                    scene.SendKiPrimitive(scene.Entities[uuid].LocalId);
+                    scene.SendKillObject(scene.Entities[uuid].LocalId);
                     scene.m_innerScene.DeleteSceneObject(uuid, false);
                     ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup();
                 }
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
index a494ff6..d6fca7b 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
             //This is important because we are not IN any database.
             //m_Entity.FakeDeleteGroup();
             foreach (SceneObjectPart part in m_Entity.Children.Values)
-                client.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId);
+                client.SendKillObject(m_Entity.RegionHandle, part.LocalId);
         }
 
         /// <summary>
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
         {
             foreach (SceneObjectPart part in m_Entity.Children.Values)
                 m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller)
-                                                           { controller.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); }
+                                                           { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); }
                 );
         }
 
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index a2d626e..35a6c2f 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -443,7 +443,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
 
         }
 
-        public virtual void SendKiPrimitive(ulong regionHandle, uint localID)
+        public virtual void SendKillObject(ulong regionHandle, uint localID)
         {
         }
 
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index bbd7b70..827540d 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator
 
                         m_scene.ForEachClient(delegate(IClientAPI controller)
                                                   {
-                                                      controller.SendKiPrimitive(m_scene.RegionInfo.RegionHandle,
+                                                      controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
                                                                                 selectedTree.LocalId);
                                                   });