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

testing

avinationmerge
UbitUmarov 2012-04-27 02:54:39 +01:00
parent 911bc81b00
commit 76d9040ed4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1113,7 +1113,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (PhysicsActor != null) if (PhysicsActor != null)
PhysicsActor.SetMomentum((Vector3)v); PhysicsActor.SetMomentum((Vector3)v);
m_velocity = (Vector3)v; // m_velocity = (Vector3)v;
} }
else if (Stopit) else if (Stopit)
{ {

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

@ -1273,7 +1273,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private void changeMomentum(Vector3 newmomentum) private void changeMomentum(Vector3 newmomentum)
{ {
_velocity = newmomentum; _velocity = newmomentum;
_target_velocity = newmomentum; _target_velocity = Vector3.Zero;
m_pidControllerActive = true; m_pidControllerActive = true;
m_colliderfilter = 0; m_colliderfilter = 0;
m_colliderObjectfilter = 0; m_colliderObjectfilter = 0;