aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-04-27 09:50:53 +0100
committerUbitUmarov2012-04-27 09:50:53 +0100
commitfedc9eb1056d02c7f99fb4f55a46fdafec02054a (patch)
treea33394ed61fefe269d410225898bd0bd41908c4e /OpenSim
parenttest (diff)
downloadopensim-SC-fedc9eb1056d02c7f99fb4f55a46fdafec02054a.zip
opensim-SC-fedc9eb1056d02c7f99fb4f55a46fdafec02054a.tar.gz
opensim-SC-fedc9eb1056d02c7f99fb4f55a46fdafec02054a.tar.bz2
opensim-SC-fedc9eb1056d02c7f99fb4f55a46fdafec02054a.tar.xz
itest
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs3
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d2e0726..25409c5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1105,11 +1105,11 @@ namespace OpenSim.Region.Framework.Scenes
1105 AbsolutePosition = newpos; 1105 AbsolutePosition = newpos;
1106 1106
1107 1107
1108 m_log.DebugFormat("[avnLocalTeleport] {0} {1}", newpos, rotateToVelXY); 1108 m_log.DebugFormat("[avnLocalTeleport] to {0} {1} init rotation {3}", newpos, rotateToVelXY,Rotation);
1109 1109
1110 if (newvel.HasValue) 1110 if (newvel.HasValue)
1111 { 1111 {
1112 if (newvel == Vector3.Zero) 1112 if ((Vector3)newvel == Vector3.Zero)
1113 { 1113 {
1114 if (PhysicsActor != null) 1114 if (PhysicsActor != null)
1115 PhysicsActor.SetMomentum(Vector3.Zero); 1115 PhysicsActor.SetMomentum(Vector3.Zero);
@@ -1126,6 +1126,7 @@ namespace OpenSim.Region.Framework.Scenes
1126 y = (float)Math.Cos(x); 1126 y = (float)Math.Cos(x);
1127 x = (float)Math.Sin(x); 1127 x = (float)Math.Sin(x);
1128 Rotation = new Quaternion(0f, 0f, x, y); 1128 Rotation = new Quaternion(0f, 0f, x, y);
1129 m_log.DebugFormat("[avnLocalTeleport] final rotation {0}", Rotation);
1129 } 1130 }
1130 1131
1131 if (PhysicsActor != null) 1132 if (PhysicsActor != null)
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index 36440b1..26f8cf0 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -1244,8 +1244,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1244 if (Body != IntPtr.Zero) 1244 if (Body != IntPtr.Zero)
1245 d.BodySetPosition(Body, newPos.X, newPos.Y, newPos.Z); 1245 d.BodySetPosition(Body, newPos.X, newPos.Y, newPos.Z);
1246 _position = newPos; 1246 _position = newPos;
1247 m_pidControllerActive = true; 1247 m_pidControllerActive = true;
1248 m_log.DebugFormat("[ode character new position] {0}", newPos);
1249 } 1248 }
1250 1249
1251 private void changeOrientation(Quaternion newOri) 1250 private void changeOrientation(Quaternion newOri)