diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 6aa34e4..56b5df6 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
| @@ -4456,14 +4456,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 4456 | // update non-physical objects like the joint proxy objects that represent the position | 4456 | // update non-physical objects like the joint proxy objects that represent the position |
| 4457 | // of the joints in the scene. | 4457 | // of the joints in the scene. |
| 4458 | 4458 | ||
| 4459 | // This routine is normally called from within a lock(OdeLock) from within the OdePhysicsScene | 4459 | // This routine is normally called from within a lock (OdeLock) from within the OdePhysicsScene |
| 4460 | // WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called | 4460 | // WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called |
| 4461 | // from within the OdePhysicsScene. | 4461 | // from within the OdePhysicsScene. |
| 4462 | 4462 | ||
| 4463 | protected internal void jointMoved(PhysicsJoint joint) | 4463 | protected internal void jointMoved(PhysicsJoint joint) |
| 4464 | { | 4464 | { |
| 4465 | 4465 | ||
| 4466 | // m_parentScene.PhysicsScene.DumpJointInfo(); // non-thread-locked version; we should already be in a lock(OdeLock) when this callback is invoked | 4466 | // m_parentScene.PhysicsScene.DumpJointInfo(); // non-thread-locked version; we should already be in a lock (OdeLock) when this callback is invoked |
| 4467 | // FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary | 4467 | // FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary |
| 4468 | SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); | 4468 | SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); |
| 4469 | if (jointProxyObject == null) | 4469 | if (jointProxyObject == null) |
| @@ -4521,7 +4521,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 4521 | // update non-physical objects like the joint proxy objects that represent the position | 4521 | // update non-physical objects like the joint proxy objects that represent the position |
| 4522 | // of the joints in the scene. | 4522 | // of the joints in the scene. |
| 4523 | 4523 | ||
| 4524 | // This routine is normally called from within a lock(OdeLock) from within the OdePhysicsScene | 4524 | // This routine is normally called from within a lock (OdeLock) from within the OdePhysicsScene |
| 4525 | // WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called | 4525 | // WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called |
| 4526 | // from within the OdePhysicsScene. | 4526 | // from within the OdePhysicsScene. |
| 4527 | protected internal void jointDeactivated(PhysicsJoint joint) | 4527 | protected internal void jointDeactivated(PhysicsJoint joint) |
| @@ -4547,7 +4547,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 4547 | // alert the user of errors by using the debug channel in the same way that scripts alert | 4547 | // alert the user of errors by using the debug channel in the same way that scripts alert |
| 4548 | // the user of compile errors. | 4548 | // the user of compile errors. |
| 4549 | 4549 | ||
| 4550 | // This routine is normally called from within a lock(OdeLock) from within the OdePhysicsScene | 4550 | // This routine is normally called from within a lock (OdeLock) from within the OdePhysicsScene |
| 4551 | // WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called | 4551 | // WARNING: be careful of deadlocks here if you manipulate the scene. Remember you are being called |
| 4552 | // from within the OdePhysicsScene. | 4552 | // from within the OdePhysicsScene. |
| 4553 | public void jointErrorMessage(PhysicsJoint joint, string message) | 4553 | public void jointErrorMessage(PhysicsJoint joint, string message) |