aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
1 files changed, 5 insertions, 5 deletions
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
2516 { 2516 {
2517 try 2517 try
2518 { 2518 {
2519 client.SendKiPrimitive(avatar.RegionHandle, avatar.LocalId); 2519 client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
2520 } 2520 }
2521 catch (NullReferenceException) 2521 catch (NullReferenceException)
2522 { 2522 {
@@ -2589,7 +2589,7 @@ namespace OpenSim.Region.Environment.Scenes
2589 2589
2590 #region Entities 2590 #region Entities
2591 2591
2592 public void SendKiPrimitive(uint localID) 2592 public void SendKillObject(uint localID)
2593 { 2593 {
2594 SceneObjectPart part = GetSceneObjectPart(localID); 2594 SceneObjectPart part = GetSceneObjectPart(localID);
2595 if (part != null) // It is a prim 2595 if (part != null) // It is a prim
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.Environment.Scenes
2600 return; 2600 return;
2601 } 2601 }
2602 } 2602 }
2603 Broadcast(delegate(IClientAPI client) { client.SendKiPrimitive(m_regionHandle, localID); }); 2603 Broadcast(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
2604 } 2604 }
2605 2605
2606 #endregion 2606 #endregion
@@ -2620,7 +2620,7 @@ namespace OpenSim.Region.Environment.Scenes
2620 m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup; 2620 m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup;
2621 m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; 2621 m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
2622 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid; 2622 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid;
2623 m_sceneGridService.KiPrimitive += SendKiPrimitive; 2623 m_sceneGridService.KiPrimitive += SendKillObject;
2624 m_sceneGridService.OnGetLandData += GetLandData; 2624 m_sceneGridService.OnGetLandData += GetLandData;
2625 } 2625 }
2626 2626
@@ -2629,7 +2629,7 @@ namespace OpenSim.Region.Environment.Scenes
2629 /// </summary> 2629 /// </summary>
2630 public void UnRegisterRegionWithComms() 2630 public void UnRegisterRegionWithComms()
2631 { 2631 {
2632 m_sceneGridService.KiPrimitive -= SendKiPrimitive; 2632 m_sceneGridService.KiPrimitive -= SendKillObject;
2633 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; 2633 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;
2634 m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; 2634 m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
2635 m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup; 2635 m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup;