diff options
Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index fc45b82..ffcb004 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -687,6 +687,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 687 | /// <param name="g2">another geometry or space</param> | 687 | /// <param name="g2">another geometry or space</param> |
| 688 | private void near(IntPtr space, IntPtr g1, IntPtr g2) | 688 | private void near(IntPtr space, IntPtr g1, IntPtr g2) |
| 689 | { | 689 | { |
| 690 | // m_log.DebugFormat("[PHYSICS]: Colliding {0} and {1} in {2}", g1, g2, space); | ||
| 690 | // no lock here! It's invoked from within Simulate(), which is thread-locked | 691 | // no lock here! It's invoked from within Simulate(), which is thread-locked |
| 691 | 692 | ||
| 692 | // Test if we're colliding a geom with a space. | 693 | // Test if we're colliding a geom with a space. |