diff options
author | Justin Clark-Casey (justincc) | 2012-02-07 20:26:26 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-07 20:26:26 +0000 |
commit | 7583768b9e40e1033cc417047226d8ab80b36294 (patch) | |
tree | c68c562db594e00c2bb27f6f878ed8871f50c86e /OpenSim/Region/Framework | |
parent | Add TestCompileAndStart100Scripts() torture test. (diff) | |
download | opensim-SC_OLD-7583768b9e40e1033cc417047226d8ab80b36294.zip opensim-SC_OLD-7583768b9e40e1033cc417047226d8ab80b36294.tar.gz opensim-SC_OLD-7583768b9e40e1033cc417047226d8ab80b36294.tar.bz2 opensim-SC_OLD-7583768b9e40e1033cc417047226d8ab80b36294.tar.xz |
Remove debug logging if physics actor is null in SOP.ApplyPhysics()
This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 0e899ca..4c339d9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1501,7 +1501,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1501 | PhysActor = null; | 1501 | PhysActor = null; |
1502 | } | 1502 | } |
1503 | 1503 | ||
1504 | // Basic Physics returns null.. joy joy joy. | 1504 | // Basic Physics can also return null as well as an exception catch. |
1505 | if (PhysActor != null) | 1505 | if (PhysActor != null) |
1506 | { | 1506 | { |
1507 | PhysActor.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info | 1507 | PhysActor.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info |
@@ -1509,10 +1509,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1509 | DoPhysicsPropertyUpdate(RigidBody, true); | 1509 | DoPhysicsPropertyUpdate(RigidBody, true); |
1510 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); | 1510 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); |
1511 | } | 1511 | } |
1512 | else | ||
1513 | { | ||
1514 | m_log.DebugFormat("[SOP]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID); | ||
1515 | } | ||
1516 | } | 1512 | } |
1517 | } | 1513 | } |
1518 | } | 1514 | } |