diff options
| author | Melanie | 2011-10-25 03:18:10 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:18:10 +0100 |
| commit | 0531b7369549ab7518d918e010ae5cad90f5c08e (patch) | |
| tree | 9b43f04f44724dca1969ae631f1a57a171816f27 /OpenSim/Region | |
| parent | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge (diff) | |
| parent | very minor removal of old commented out line of code in OdeScene (diff) | |
| download | opensim-SC-0531b7369549ab7518d918e010ae5cad90f5c08e.zip opensim-SC-0531b7369549ab7518d918e010ae5cad90f5c08e.tar.gz opensim-SC-0531b7369549ab7518d918e010ae5cad90f5c08e.tar.bz2 opensim-SC-0531b7369549ab7518d918e010ae5cad90f5c08e.tar.xz | |
Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 8 |
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); | |||
| 2811 | } | 2811 | } |
| 2812 | } | 2812 | } |
| 2813 | 2813 | ||
| 2814 | //if (m_global_contactcount > 5) | 2814 | // if (m_global_contactcount > 0) |
| 2815 | //{ | 2815 | // m_log.DebugFormat( |
| 2816 | // m_log.DebugFormat("[PHYSICS]: Contacts:{0}", m_global_contactcount); | 2816 | // "[PHYSICS]: Collision contacts to process this frame = {0}", m_global_contactcount); |
| 2817 | //} | ||
| 2818 | 2817 | ||
| 2819 | m_global_contactcount = 0; | 2818 | m_global_contactcount = 0; |
| 2820 | 2819 | ||
| 2821 | d.WorldQuickStep(world, ODE_STEPSIZE); | 2820 | d.WorldQuickStep(world, ODE_STEPSIZE); |
| 2822 | d.JointGroupEmpty(contactgroup); | 2821 | d.JointGroupEmpty(contactgroup); |
| 2823 | //ode.dunlock(world); | ||
| 2824 | } | 2822 | } |
| 2825 | catch (Exception e) | 2823 | catch (Exception e) |
| 2826 | { | 2824 | { |