diff options
author | UbitUmarov | 2012-04-27 02:54:39 +0100 |
---|---|---|
committer | UbitUmarov | 2012-04-27 02:54:39 +0100 |
commit | 76d9040ed41facca73b8628f381dd8bdec3c9dc2 (patch) | |
tree | f1b9a6cb6299db50f3960def2cf5048fe60ca8a3 /OpenSim | |
parent | testing (diff) | |
download | opensim-SC_OLD-76d9040ed41facca73b8628f381dd8bdec3c9dc2.zip opensim-SC_OLD-76d9040ed41facca73b8628f381dd8bdec3c9dc2.tar.gz opensim-SC_OLD-76d9040ed41facca73b8628f381dd8bdec3c9dc2.tar.bz2 opensim-SC_OLD-76d9040ed41facca73b8628f381dd8bdec3c9dc2.tar.xz |
testing
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e9ff07a..37196b0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1113,7 +1113,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1113 | { | 1113 | { |
1114 | if (PhysicsActor != null) | 1114 | if (PhysicsActor != null) |
1115 | PhysicsActor.SetMomentum((Vector3)v); | 1115 | PhysicsActor.SetMomentum((Vector3)v); |
1116 | m_velocity = (Vector3)v; | 1116 | // m_velocity = (Vector3)v; |
1117 | } | 1117 | } |
1118 | else if (Stopit) | 1118 | else if (Stopit) |
1119 | { | 1119 | { |
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 7356123..4b093ba 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
@@ -1273,7 +1273,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1273 | private void changeMomentum(Vector3 newmomentum) | 1273 | private void changeMomentum(Vector3 newmomentum) |
1274 | { | 1274 | { |
1275 | _velocity = newmomentum; | 1275 | _velocity = newmomentum; |
1276 | _target_velocity = newmomentum; | 1276 | _target_velocity = Vector3.Zero; |
1277 | m_pidControllerActive = true; | 1277 | m_pidControllerActive = true; |
1278 | m_colliderfilter = 0; | 1278 | m_colliderfilter = 0; |
1279 | m_colliderObjectfilter = 0; | 1279 | m_colliderObjectfilter = 0; |