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

TESTING

avinationmerge
UbitUmarov 2012-04-27 01:43:27 +01:00
parent 30ab9647ba
commit a64a9e48de
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1111,15 +1111,15 @@ namespace OpenSim.Region.Framework.Scenes
if (v.HasValue) if (v.HasValue)
{ {
if (PhysicsActor != null) // speedup if (PhysicsActor != null)
PhysicsActor.SetMomentum((Vector3)v); PhysicsActor.SetMomentum((Vector3)v);
Velocity = (Vector3)v; m_velocity = (Vector3)v;
} }
else if (Stopit) else if (Stopit)
{ {
if (PhysicsActor != null) // speedup if (PhysicsActor != null)
PhysicsActor.SetMomentum(Vector3.Zero); PhysicsActor.SetMomentum(Vector3.Zero);
Velocity = Vector3.Zero; // zero any velocity request m_velocity = Vector3.Zero;
} }
SendTerseUpdateToAllClients(); SendTerseUpdateToAllClients();

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

@ -1210,6 +1210,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (Body != IntPtr.Zero) if (Body != IntPtr.Zero)
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;
} }
private void changeOrientation(Quaternion newOri) private void changeOrientation(Quaternion newOri)