diff options
author | lbsa71 | 2009-02-20 17:18:07 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-20 17:18:07 +0000 |
commit | 602dafae55663d51064067e14072f0c0f4e8ed00 (patch) | |
tree | b9b62eeaddcdd95bc64a3b0ad7c14e9649e9cabb /OpenSim/Region/Framework | |
parent | * Upped VersionInfo to 0.6.3 and in the process, changed assemblyinfo to 0.6.... (diff) | |
download | opensim-SC_OLD-602dafae55663d51064067e14072f0c0f4e8ed00.zip opensim-SC_OLD-602dafae55663d51064067e14072f0c0f4e8ed00.tar.gz opensim-SC_OLD-602dafae55663d51064067e14072f0c0f4e8ed00.tar.bz2 opensim-SC_OLD-602dafae55663d51064067e14072f0c0f4e8ed00.tar.xz |
* Renamed and encapsulated m_sceneGraph as SceneGraph for ccc
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
2 files changed, 13 insertions, 4 deletions
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> |