aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-14 14:43:46 +0000
committerJustin Clarke Casey2008-10-14 14:43:46 +0000
commit3b9400bceaa9389489951b31322204bb26cab076 (patch)
treec818f31ef12f973e15502ec1d0eb8b8c7bd97738 /OpenSim/Region/Environment/Modules
parent* Make KillObjectPackets reliable (diff)
downloadopensim-SC_OLD-3b9400bceaa9389489951b31322204bb26cab076.zip
opensim-SC_OLD-3b9400bceaa9389489951b31322204bb26cab076.tar.gz
opensim-SC_OLD-3b9400bceaa9389489951b31322204bb26cab076.tar.bz2
opensim-SC_OLD-3b9400bceaa9389489951b31322204bb26cab076.tar.xz
* refactor: rename SendKiPrimitive to SendKillObject since this appears more descriptive of what it actually does
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs2
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
260 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles. 260 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles.
261 ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup(); 261 ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup();
262 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); 262 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
263 scene.SendKiPrimitive(scene.Entities[uuid].LocalId); 263 scene.SendKillObject(scene.Entities[uuid].LocalId);
264 scene.m_innerScene.DeleteSceneObject(uuid, false); 264 scene.m_innerScene.DeleteSceneObject(uuid, false);
265 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(); 265 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup();
266 } 266 }
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
189 //This is important because we are not IN any database. 189 //This is important because we are not IN any database.
190 //m_Entity.FakeDeleteGroup(); 190 //m_Entity.FakeDeleteGroup();
191 foreach (SceneObjectPart part in m_Entity.Children.Values) 191 foreach (SceneObjectPart part in m_Entity.Children.Values)
192 client.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); 192 client.SendKillObject(m_Entity.RegionHandle, part.LocalId);
193 } 193 }
194 194
195 /// <summary> 195 /// <summary>
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
199 { 199 {
200 foreach (SceneObjectPart part in m_Entity.Children.Values) 200 foreach (SceneObjectPart part in m_Entity.Children.Values)
201 m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) 201 m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller)
202 { controller.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); } 202 { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); }
203 ); 203 );
204 } 204 }
205 205
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
443 443
444 } 444 }
445 445
446 public virtual void SendKiPrimitive(ulong regionHandle, uint localID) 446 public virtual void SendKillObject(ulong regionHandle, uint localID)
447 { 447 {
448 } 448 }
449 449
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
186 186
187 m_scene.ForEachClient(delegate(IClientAPI controller) 187 m_scene.ForEachClient(delegate(IClientAPI controller)
188 { 188 {
189 controller.SendKiPrimitive(m_scene.RegionInfo.RegionHandle, 189 controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
190 selectedTree.LocalId); 190 selectedTree.LocalId);
191 }); 191 });
192 192