From 8ef7df5a563a850fea6c1a6f22de55a09cecebe7 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Fri, 27 Apr 2012 11:01:34 +0100
Subject: [PATCH] test

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs     | 3 ---
 OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 840bdefeb1..80f21cea18 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1104,9 +1104,6 @@ namespace OpenSim.Region.Framework.Scenes
             CheckLandingPoint(ref newpos);
             AbsolutePosition = newpos;
 
-
-            m_log.DebugFormat("[avnLocalTeleport] to {0} {1} init rotation {2}", newpos, rotateToVelXY,Rotation);
-
             if (newvel.HasValue)
             {
                 if ((Vector3)newvel == Vector3.Zero)
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index 26f8cf04a7..4f8c4c379e 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -1004,13 +1004,13 @@ namespace OpenSim.Region.Physics.OdePlugin
             }
             else
             {
-                breakfactor = 5f * m_mass;
+                breakfactor = m_mass;
                 vec.X -= breakfactor * vel.X;
                 vec.Y -= breakfactor * vel.Y;
                 if (flying)
                     vec.Z -= breakfactor * vel.Z;
                 else
-                    vec.Z -= 2f* m_mass * vel.Z;
+                    vec.Z -= .5f* m_mass * vel.Z;
             }
 
             if (flying)