From fedc9eb1056d02c7f99fb4f55a46fdafec02054a Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 27 Apr 2012 09:50:53 +0100 Subject: [PATCH] itest --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 +++-- OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d2e072685e..25409c5e2b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1105,11 +1105,11 @@ namespace OpenSim.Region.Framework.Scenes 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 == Vector3.Zero) + if ((Vector3)newvel == Vector3.Zero) { if (PhysicsActor != null) PhysicsActor.SetMomentum(Vector3.Zero); @@ -1126,6 +1126,7 @@ namespace OpenSim.Region.Framework.Scenes y = (float)Math.Cos(x); x = (float)Math.Sin(x); Rotation = new Quaternion(0f, 0f, x, y); + m_log.DebugFormat("[avnLocalTeleport] final rotation {0}", Rotation); } if (PhysicsActor != null) diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 36440b164a..26f8cf04a7 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs @@ -1244,8 +1244,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (Body != IntPtr.Zero) d.BodySetPosition(Body, newPos.X, newPos.Y, newPos.Z); _position = newPos; - m_pidControllerActive = true; - m_log.DebugFormat("[ode character new position] {0}", newPos); + m_pidControllerActive = true; } private void changeOrientation(Quaternion newOri)