aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs4
2 files changed, 2 insertions, 5 deletions
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
1104 CheckLandingPoint(ref newpos); 1104 CheckLandingPoint(ref newpos);
1105 AbsolutePosition = newpos; 1105 AbsolutePosition = newpos;
1106 1106
1107
1108 m_log.DebugFormat("[avnLocalTeleport] to {0} {1} init rotation {2}", newpos, rotateToVelXY,Rotation);
1109
1110 if (newvel.HasValue) 1107 if (newvel.HasValue)
1111 { 1108 {
1112 if ((Vector3)newvel == Vector3.Zero) 1109 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
1004 } 1004 }
1005 else 1005 else
1006 { 1006 {
1007 breakfactor = 5f * m_mass; 1007 breakfactor = m_mass;
1008 vec.X -= breakfactor * vel.X; 1008 vec.X -= breakfactor * vel.X;
1009 vec.Y -= breakfactor * vel.Y; 1009 vec.Y -= breakfactor * vel.Y;
1010 if (flying) 1010 if (flying)
1011 vec.Z -= breakfactor * vel.Z; 1011 vec.Z -= breakfactor * vel.Z;
1012 else 1012 else
1013 vec.Z -= 2f* m_mass * vel.Z; 1013 vec.Z -= .5f* m_mass * vel.Z;
1014 } 1014 }
1015 1015
1016 if (flying) 1016 if (flying)