aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-12 22:51:56 +0100
committerJustin Clark-Casey (justincc)2011-09-12 22:51:56 +0100
commit56cd7d96851203efa3e84b4c8be70177e2d2d453 (patch)
tree6bbd1840a82bd3885950ea138518f9ff99df0ac0 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentminor: if the script engine fails to find a prim for a script, also print out... (diff)
downloadopensim-SC_OLD-56cd7d96851203efa3e84b4c8be70177e2d2d453.zip
opensim-SC_OLD-56cd7d96851203efa3e84b4c8be70177e2d2d453.tar.gz
opensim-SC_OLD-56cd7d96851203efa3e84b4c8be70177e2d2d453.tar.bz2
opensim-SC_OLD-56cd7d96851203efa3e84b4c8be70177e2d2d453.tar.xz
stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is always passed in at the same time.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 89e6ddb..40dc2f8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -74,7 +74,6 @@ namespace OpenSim.Region.Framework.Scenes
74 74
75 protected internal EntityManager Entities = new EntityManager(); 75 protected internal EntityManager Entities = new EntityManager();
76 76
77 protected RegionInfo m_regInfo;
78 protected Scene m_parentScene; 77 protected Scene m_parentScene;
79 protected Dictionary<UUID, SceneObjectGroup> m_updateList = new Dictionary<UUID, SceneObjectGroup>(); 78 protected Dictionary<UUID, SceneObjectGroup> m_updateList = new Dictionary<UUID, SceneObjectGroup>();
80 protected int m_numRootAgents = 0; 79 protected int m_numRootAgents = 0;
@@ -108,10 +107,9 @@ namespace OpenSim.Region.Framework.Scenes
108 107
109 #endregion 108 #endregion
110 109
111 protected internal SceneGraph(Scene parent, RegionInfo regInfo) 110 protected internal SceneGraph(Scene parent)
112 { 111 {
113 m_parentScene = parent; 112 m_parentScene = parent;
114 m_regInfo = regInfo;
115 } 113 }
116 114
117 public PhysicsScene PhysicsScene 115 public PhysicsScene PhysicsScene
@@ -122,7 +120,6 @@ namespace OpenSim.Region.Framework.Scenes
122 // If we're not doing the initial set 120 // If we're not doing the initial set
123 // Then we've got to remove the previous 121 // Then we've got to remove the previous
124 // event handler 122 // event handler
125
126 if (_PhyScene != null) 123 if (_PhyScene != null)
127 _PhyScene.OnPhysicsCrash -= physicsBasedCrash; 124 _PhyScene.OnPhysicsCrash -= physicsBasedCrash;
128 125
@@ -593,7 +590,7 @@ namespace OpenSim.Region.Framework.Scenes
593 ScenePresence newAvatar = null; 590 ScenePresence newAvatar = null;
594 591
595 // ScenePresence always defaults to child agent 592 // ScenePresence always defaults to child agent
596 newAvatar = new ScenePresence(client, m_parentScene, m_regInfo, appearance, type); 593 newAvatar = new ScenePresence(client, m_parentScene, appearance, type);
597 594
598 AddScenePresence(newAvatar); 595 AddScenePresence(newAvatar);
599 596