7 files changed, 14 insertions, 14 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);
                                                   });
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index b69520c..e95b1d7 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2516,7 +2516,7 @@ namespace OpenSim.Region.Environment.Scenes
                       {
                           try
                           {
-                              client.SendKiPrimitive(avatar.RegionHandle, avatar.LocalId);
+                              client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
                           }
                           catch (NullReferenceException)
                           {
@@ -2589,7 +2589,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Entities
 
-        public void SendKiPrimitive(uint localID)
+        public void SendKillObject(uint localID)
         {
             SceneObjectPart part = GetSceneObjectPart(localID);
             if (part != null) // It is a prim
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.Environment.Scenes
                         return;
                 }
             }
-            Broadcast(delegate(IClientAPI client) { client.SendKiPrimitive(m_regionHandle, localID); });
+            Broadcast(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
         }
 
         #endregion
@@ -2620,7 +2620,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup;
             m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
             m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid;
-            m_sceneGridService.KiPrimitive += SendKiPrimitive;
+            m_sceneGridService.KiPrimitive += SendKillObject;
             m_sceneGridService.OnGetLandData += GetLandData;
         }
 
@@ -2629,7 +2629,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void UnRegisterRegionWithComms()
         {
-            m_sceneGridService.KiPrimitive -= SendKiPrimitive;
+            m_sceneGridService.KiPrimitive -= SendKillObject;
             m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;
             m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
             m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 2c3e767..37f3caf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -750,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes
                 //
                 if (IsSelected)
                 {
-                    m_scene.SendKiPrimitive(m_rootPart.LocalId);
+                    m_scene.SendKillObject(m_rootPart.LocalId);
                 }
 
                 IsSelected = false; // fudge....
@@ -985,7 +985,7 @@ namespace OpenSim.Region.Environment.Scenes
                         }
 
                         if (m_rootPart != null && part == m_rootPart)
-                            avatars[i].ControllingClient.SendKiPrimitive(m_regionHandle, part.LocalId);
+                            avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
                     }
                 }
 
@@ -1011,7 +1011,7 @@ namespace OpenSim.Region.Environment.Scenes
                     }
 
                     if (m_rootPart != null && part == m_rootPart)
-                        avatars[i].ControllingClient.SendKiPrimitive(m_regionHandle, part.LocalId);
+                        avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
                 }
             }
         }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8120c62..963c71b 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2068,7 +2068,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                     CrossAttachmentsIntoNewRegion(neighbourHandle);
 
-                    m_scene.SendKiPrimitive(m_localId);
+                    m_scene.SendKillObject(m_localId);
 
                     m_scene.NotifyMyCoarseLocationChange();
                     // the user may change their profile information in other region,