diff options
Diffstat (limited to '')
3 files changed, 3 insertions, 3 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) |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs index 0202841..bb3a18d 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
260 | List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>(); | 260 | List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>(); |
261 | 261 | ||
262 | // Filter entities so that we only have scene objects. | 262 | // Filter entities so that we only have scene objects. |
263 | // FIXME: Would be nicer to have this as a proper list in InnerScene, since lots of methods | 263 | // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods |
264 | // end up having to do this | 264 | // end up having to do this |
265 | foreach (EntityBase entity in entities) | 265 | foreach (EntityBase entity in entities) |
266 | { | 266 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index c38d502..52175f4 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -490,7 +490,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
490 | } | 490 | } |
491 | else if (reportType == 0) | 491 | else if (reportType == 0) |
492 | { | 492 | { |
493 | SceneData = m_scene.m_innerScene.GetTopScripts(); | 493 | SceneData = m_scene.m_sceneGraph.GetTopScripts(); |
494 | } | 494 | } |
495 | 495 | ||
496 | List<LandStatReportItem> SceneReport = new List<LandStatReportItem>(); | 496 | List<LandStatReportItem> SceneReport = new List<LandStatReportItem>(); |