aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs15
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 54c420d..49b8bda 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -233,12 +233,6 @@ namespace OpenSim.Region.Framework.Scenes
233 get { return m_defaultScriptEngine; } 233 get { return m_defaultScriptEngine; }
234 } 234 }
235 235
236 // Local reference to the objects in the scene (which are held in the scenegraph)
237 // public Dictionary<UUID, SceneObjectGroup> Objects
238 // {
239 // get { return m_sceneGraph.SceneObjects; }
240 // }
241
242 // Reference to all of the agents in the scene (root and child) 236 // Reference to all of the agents in the scene (root and child)
243 protected Dictionary<UUID, ScenePresence> m_scenePresences 237 protected Dictionary<UUID, ScenePresence> m_scenePresences
244 { 238 {
@@ -246,12 +240,6 @@ namespace OpenSim.Region.Framework.Scenes
246 set { m_sceneGraph.ScenePresences = value; } 240 set { m_sceneGraph.ScenePresences = value; }
247 } 241 }
248 242
249 // protected Dictionary<UUID, SceneObjectGroup> m_sceneObjects
250 // {
251 // get { return m_sceneGraph.SceneObjects; }
252 // set { m_sceneGraph.SceneObjects = value; }
253 // }
254
255 public EntityManager Entities 243 public EntityManager Entities
256 { 244 {
257 get { return m_sceneGraph.Entities; } 245 get { return m_sceneGraph.Entities; }
@@ -3492,7 +3480,6 @@ namespace OpenSim.Region.Framework.Scenes
3492 protected internal void jointMoved(PhysicsJoint joint) 3480 protected internal void jointMoved(PhysicsJoint joint)
3493 { 3481 {
3494 // m_parentScene.PhysicsScene.DumpJointInfo(); // non-thread-locked version; we should already be in a lock (OdeLock) when this callback is invoked 3482 // m_parentScene.PhysicsScene.DumpJointInfo(); // non-thread-locked version; we should already be in a lock (OdeLock) when this callback is invoked
3495 // FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary
3496 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); 3483 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene);
3497 if (jointProxyObject == null) 3484 if (jointProxyObject == null)
3498 { 3485 {
@@ -3555,7 +3542,6 @@ namespace OpenSim.Region.Framework.Scenes
3555 protected internal void jointDeactivated(PhysicsJoint joint) 3542 protected internal void jointDeactivated(PhysicsJoint joint)
3556 { 3543 {
3557 //m_log.Debug("[NINJA] SceneGraph.jointDeactivated, joint:" + joint.ObjectNameInScene); 3544 //m_log.Debug("[NINJA] SceneGraph.jointDeactivated, joint:" + joint.ObjectNameInScene);
3558 // FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary
3559 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); 3545 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene);
3560 if (jointProxyObject == null) 3546 if (jointProxyObject == null)
3561 { 3547 {
@@ -3580,7 +3566,6 @@ namespace OpenSim.Region.Framework.Scenes
3580 // from within the OdePhysicsScene. 3566 // from within the OdePhysicsScene.
3581 public void jointErrorMessage(PhysicsJoint joint, string message) 3567 public void jointErrorMessage(PhysicsJoint joint, string message)
3582 { 3568 {
3583 // FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary
3584 if (joint != null) 3569 if (joint != null)
3585 { 3570 {
3586 if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages) 3571 if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages)