aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs2
4 files changed, 15 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 0f5ee2e..b567047 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -611,7 +611,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
611 } 611 }
612 else if (reportType == 0) 612 else if (reportType == 0)
613 { 613 {
614 SceneData = m_scene.m_sceneGraph.GetTopScripts(); 614 SceneData = m_scene.SceneGraph.GetTopScripts();
615 } 615 }
616 616
617 List<LandStatReportItem> SceneReport = new List<LandStatReportItem>(); 617 List<LandStatReportItem> SceneReport = new List<LandStatReportItem>();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index aa8b51a..9144bb9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
73 /// The scene graph for this scene 73 /// The scene graph for this scene
74 /// </value> 74 /// </value>
75 /// TODO: Possibly stop other classes being able to manipulate this directly. 75 /// TODO: Possibly stop other classes being able to manipulate this directly.
76 public SceneGraph m_sceneGraph; 76 private SceneGraph m_sceneGraph;
77 77
78 /// <summary> 78 /// <summary>
79 /// Are we applying physics to any of the prims in this scene? 79 /// Are we applying physics to any of the prims in this scene?
@@ -393,6 +393,15 @@ namespace OpenSim.Region.Framework.Scenes
393 get { return shuttingdown; } 393 get { return shuttingdown; }
394 } 394 }
395 395
396 /// <value>
397 /// The scene graph for this scene
398 /// </value>
399 /// TODO: Possibly stop other classes being able to manipulate this directly.
400 public SceneGraph SceneGraph
401 {
402 get { return m_sceneGraph; }
403 }
404
396 protected virtual void RegisterDefaultSceneEvents() 405 protected virtual void RegisterDefaultSceneEvents()
397 { 406 {
398 IDialogModule dm = RequestModuleInterface<IDialogModule>(); 407 IDialogModule dm = RequestModuleInterface<IDialogModule>();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6d0927b..69bc554 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1116,13 +1116,13 @@ namespace OpenSim.Region.Framework.Scenes
1116 scriptScore = 0; 1116 scriptScore = 0;
1117 1117
1118 scriptScore += (float)count; 1118 scriptScore += (float)count;
1119 SceneGraph d = m_scene.m_sceneGraph; 1119 SceneGraph d = m_scene.SceneGraph;
1120 d.AddToScriptLPS(count); 1120 d.AddToScriptLPS(count);
1121 } 1121 }
1122 1122
1123 public void AddActiveScriptCount(int count) 1123 public void AddActiveScriptCount(int count)
1124 { 1124 {
1125 SceneGraph d = m_scene.m_sceneGraph; 1125 SceneGraph d = m_scene.SceneGraph;
1126 d.AddActiveScripts(count); 1126 d.AddActiveScripts(count);
1127 } 1127 }
1128 1128
@@ -1858,7 +1858,7 @@ namespace OpenSim.Region.Framework.Scenes
1858 { 1858 {
1859 if (m_scene == null) // Need to check here as it's null during object creation 1859 if (m_scene == null) // Need to check here as it's null during object creation
1860 return; 1860 return;
1861 m_scene.m_sceneGraph.AddToUpdateList(this); 1861 m_scene.SceneGraph.AddToUpdateList(this);
1862 } 1862 }
1863 1863
1864 /// <summary> 1864 /// <summary>
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
index 761dca9..c9a760b 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.OptionalModules.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_sceneGraph.DeleteSceneObject(uuid, false); 264 scene.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)