OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test

avinationmerge
UbitUmarov 2012-04-27 11:01:34 +01:00
parent 2006188ee5
commit 8ef7df5a56
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1104,9 +1104,6 @@ namespace OpenSim.Region.Framework.Scenes
CheckLandingPoint(ref newpos); CheckLandingPoint(ref newpos);
AbsolutePosition = newpos; AbsolutePosition = newpos;
m_log.DebugFormat("[avnLocalTeleport] to {0} {1} init rotation {2}", newpos, rotateToVelXY,Rotation);
if (newvel.HasValue) if (newvel.HasValue)
{ {
if ((Vector3)newvel == Vector3.Zero) if ((Vector3)newvel == Vector3.Zero)

4
OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
View File

@ -1004,13 +1004,13 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{ {
breakfactor = 5f * m_mass; breakfactor = m_mass;
vec.X -= breakfactor * vel.X; vec.X -= breakfactor * vel.X;
vec.Y -= breakfactor * vel.Y; vec.Y -= breakfactor * vel.Y;
if (flying) if (flying)
vec.Z -= breakfactor * vel.Z; vec.Z -= breakfactor * vel.Z;
else else
vec.Z -= 2f* m_mass * vel.Z; vec.Z -= .5f* m_mass * vel.Z;
} }
if (flying) if (flying)