From 01446074b1cc2cde2fb3789b3a00d58a899a587f Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Thu, 16 Jul 2009 19:09:03 +0000
Subject: [PATCH] Revert the nonessential part of r10033 to restore sanity to
 trampolines

---
 OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index e19d5892f5..b8af77dded 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -825,10 +825,12 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_pidControllerActive = false;
                     force *= 100f;
                     doForce(force);
-                    m_log.Debug("Push!");
-                    _target_velocity.X += force.X;
-                     _target_velocity.Y += force.Y;
-                    _target_velocity.Z += force.Z;
+                    // If uncommented, things get pushed off world
+                    //
+                    // m_log.Debug("Push!");
+                    // _target_velocity.X += force.X;
+                    // _target_velocity.Y += force.Y;
+                    // _target_velocity.Z += force.Z;
                 }
                 else
                 {