| Filename | |
|---|---|
| OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 840bdef..80f21ce 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 26f8cf0..4f8c4c3 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)