diff options
author | Melanie | 2012-02-07 20:52:04 +0100 |
---|---|---|
committer | Melanie | 2012-02-07 20:52:04 +0100 |
commit | de255321f1f1868e641f935ecaa25151867be1e3 (patch) | |
tree | 9baf834c0ad1eb40f5fd4dbae30efc7e992d54ee /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Experimental. Expand Fire & Forget for NPC delete (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-de255321f1f1868e641f935ecaa25151867be1e3.zip opensim-SC-de255321f1f1868e641f935ecaa25151867be1e3.tar.gz opensim-SC-de255321f1f1868e641f935ecaa25151867be1e3.tar.bz2 opensim-SC-de255321f1f1868e641f935ecaa25151867be1e3.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
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 a6c234e..ac39b6b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1549,7 +1549,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1549 | PhysActor = null; | 1549 | PhysActor = null; |
1550 | } | 1550 | } |
1551 | 1551 | ||
1552 | // Basic Physics returns null.. joy joy joy. | 1552 | // Basic Physics can also return null as well as an exception catch. |
1553 | if (PhysActor != null) | 1553 | if (PhysActor != null) |
1554 | { | 1554 | { |
1555 | PhysActor.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info | 1555 | PhysActor.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info |
@@ -1557,10 +1557,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1557 | DoPhysicsPropertyUpdate(RigidBody, true); | 1557 | DoPhysicsPropertyUpdate(RigidBody, true); |
1558 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); | 1558 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); |
1559 | } | 1559 | } |
1560 | else | ||
1561 | { | ||
1562 | m_log.DebugFormat("[SOP]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID); | ||
1563 | } | ||
1564 | } | 1560 | } |
1565 | } | 1561 | } |
1566 | } | 1562 | } |