diff options
author | Diva Canto | 2010-06-19 09:44:02 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-19 09:44:02 -0700 |
commit | 1e7ce6dbced67350214f921566f39a3d1413e9bb (patch) | |
tree | f0ff710f02e6deba5bac90e802f295dd7c109877 /OpenSim | |
parent | Reverting my last two commits, putting back Melanie's exception handler. Does... (diff) | |
download | opensim-SC-1e7ce6dbced67350214f921566f39a3d1413e9bb.zip opensim-SC-1e7ce6dbced67350214f921566f39a3d1413e9bb.tar.gz opensim-SC-1e7ce6dbced67350214f921566f39a3d1413e9bb.tar.bz2 opensim-SC-1e7ce6dbced67350214f921566f39a3d1413e9bb.tar.xz |
Hunting for the problem in #4777
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 38b2dc2..59fd805 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1487,6 +1487,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1487 | DoPhysicsPropertyUpdate(RigidBody, true); | 1487 | DoPhysicsPropertyUpdate(RigidBody, true); |
1488 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); | 1488 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); |
1489 | } | 1489 | } |
1490 | else | ||
1491 | { | ||
1492 | m_log.DebugFormat("[SPEW]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID); | ||
1493 | } | ||
1490 | } | 1494 | } |
1491 | } | 1495 | } |
1492 | } | 1496 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 100f98d..7fd59a0 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -1781,6 +1781,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName); | 1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName); |
1782 | m_log.Debug(e.ToString()); | 1782 | m_log.Debug(e.ToString()); |
1783 | mesh = null; | 1783 | mesh = null; |
1784 | return null; | ||
1784 | } | 1785 | } |
1785 | } | 1786 | } |
1786 | 1787 | ||