aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-12 20:16:46 +0000
committerJustin Clarke Casey2008-11-12 20:16:46 +0000
commitcec112c87a0e9b259ddff215422bde3fc5dd4dc2 (patch)
treefac2489ef1c8d3ec0e0acaf0533e4db46575f170 /OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
parent* Update Mono.Addins.dll to 0.4, as per sdague's suggestion (diff)
downloadopensim-SC_OLD-cec112c87a0e9b259ddff215422bde3fc5dd4dc2.zip
opensim-SC_OLD-cec112c87a0e9b259ddff215422bde3fc5dd4dc2.tar.gz
opensim-SC_OLD-cec112c87a0e9b259ddff215422bde3fc5dd4dc2.tar.bz2
opensim-SC_OLD-cec112c87a0e9b259ddff215422bde3fc5dd4dc2.tar.xz
* refactor: as per a recent opensim-dev thread, rename InnerScene to SceneGraph to make it more descriptive of its intended function
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 e58d945..5229489 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
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.SendKillObject(scene.Entities[uuid].LocalId); 263 scene.SendKillObject(scene.Entities[uuid].LocalId);
264 scene.m_innerScene.DeleteSceneObject(uuid, false); 264 scene.m_sceneGraph.DeleteSceneObject(uuid, false);
265 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(false); 265 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(false);
266 } 266 }
267 catch(Exception e) 267 catch(Exception e)