aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
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/ContentManagementSystem/CMModel.cs
parent* Make KillObjectPackets reliable (diff)
downloadopensim-SC-3b9400bceaa9389489951b31322204bb26cab076.zip
opensim-SC-3b9400bceaa9389489951b31322204bb26cab076.tar.gz
opensim-SC-3b9400bceaa9389489951b31322204bb26cab076.tar.bz2
opensim-SC-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/ContentManagementSystem/CMModel.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs2
1 files changed, 1 insertions, 1 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 }