aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJeff Ames2008-12-30 01:08:07 +0000
committerJeff Ames2008-12-30 01:08:07 +0000
commit2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b (patch)
treec39317267e7f1d634fc1a922ded51c6e48e329d1 /OpenSim/Region/Environment/Scenes
parentChanging the default Comms module to be RESTComms, in case none is specified ... (diff)
downloadopensim-SC_OLD-2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b.zip
opensim-SC_OLD-2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b.tar.gz
opensim-SC_OLD-2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b.tar.bz2
opensim-SC_OLD-2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
2 files changed, 5 insertions, 5 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)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 0f3e065..8b45484 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1624,7 +1624,7 @@ if (m_shape != null) {
1624 part.m_fromUserInventoryItemID = fromUserInventoryItemId; 1624 part.m_fromUserInventoryItemID = fromUserInventoryItemId;
1625 1625
1626 // for tempOnRez objects, we have to fix the Expire date. 1626 // for tempOnRez objects, we have to fix the Expire date.
1627 if((part.Flags & PrimFlags.TemporaryOnRez) != 0) part.ResetExpire(); 1627 if ((part.Flags & PrimFlags.TemporaryOnRez) != 0) part.ResetExpire();
1628 1628
1629 return part; 1629 return part;
1630 } 1630 }