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

itest

avinationmerge
UbitUmarov 2012-04-27 09:50:53 +01:00
parent 1c735facee
commit fedc9eb105
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1105,11 +1105,11 @@ namespace OpenSim.Region.Framework.Scenes
AbsolutePosition = newpos; AbsolutePosition = newpos;
m_log.DebugFormat("[avnLocalTeleport] {0} {1}", newpos, rotateToVelXY); m_log.DebugFormat("[avnLocalTeleport] to {0} {1} init rotation {3}", newpos, rotateToVelXY,Rotation);
if (newvel.HasValue) if (newvel.HasValue)
{ {
if (newvel == Vector3.Zero) if ((Vector3)newvel == Vector3.Zero)
{ {
if (PhysicsActor != null) if (PhysicsActor != null)
PhysicsActor.SetMomentum(Vector3.Zero); PhysicsActor.SetMomentum(Vector3.Zero);
@ -1126,6 +1126,7 @@ namespace OpenSim.Region.Framework.Scenes
y = (float)Math.Cos(x); y = (float)Math.Cos(x);
x = (float)Math.Sin(x); x = (float)Math.Sin(x);
Rotation = new Quaternion(0f, 0f, x, y); Rotation = new Quaternion(0f, 0f, x, y);
m_log.DebugFormat("[avnLocalTeleport] final rotation {0}", Rotation);
} }
if (PhysicsActor != null) if (PhysicsActor != null)

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

@ -1245,7 +1245,6 @@ namespace OpenSim.Region.Physics.OdePlugin
d.BodySetPosition(Body, newPos.X, newPos.Y, newPos.Z); d.BodySetPosition(Body, newPos.X, newPos.Y, newPos.Z);
_position = newPos; _position = newPos;
m_pidControllerActive = true; m_pidControllerActive = true;
m_log.DebugFormat("[ode character new position] {0}", newPos);
} }
private void changeOrientation(Quaternion newOri) private void changeOrientation(Quaternion newOri)