Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge

1 files changed, 3 insertions, 5 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 09bccf9..0810ae0 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2811,16 +2811,14 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
                             }
                         }
 
-                        //if (m_global_contactcount > 5)
-                        //{
-                        //    m_log.DebugFormat("[PHYSICS]: Contacts:{0}", m_global_contactcount);
-                        //}
+//                        if (m_global_contactcount > 0)
+//                            m_log.DebugFormat(
+//                                "[PHYSICS]: Collision contacts to process this frame = {0}", m_global_contactcount);
 
                         m_global_contactcount = 0;
                         
                         d.WorldQuickStep(world, ODE_STEPSIZE);
                         d.JointGroupEmpty(contactgroup);
-                        //ode.dunlock(world);
                     }
                     catch (Exception e)
                     {