aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-26 11:48:05 -0400
committerTeravus Ovares (Dan Olivares)2009-08-26 11:48:05 -0400
commit54e05a083d2aeb7a892647f64edfd52db80ce5ed (patch)
tree1fca51f8dd19c0f4871d8e1b875511c6087b3675 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
parent* It turns out that Physics heightmap values were being stored in managed mem... (diff)
parentAdd reference to OpenMetaverse.dll to UserServer.Modules to make MSVS happy (diff)
downloadopensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.zip
opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.gz
opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.bz2
opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 35433c6..38df751 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1025,7 +1025,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1025 } 1025 }
1026 } 1026 }
1027 1027
1028
1029 if (flying) 1028 if (flying)
1030 { 1029 {
1031 vec.Z = (_target_velocity.Z - vel.Z) * (PID_D); 1030 vec.Z = (_target_velocity.Z - vel.Z) * (PID_D);
@@ -1044,7 +1043,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1044 vec.Z += (target_altitude - _position.Z) * PID_P * 5.0f; 1043 vec.Z += (target_altitude - _position.Z) * PID_P * 5.0f;
1045 } 1044 }
1046 // end add Kitto Flora 1045 // end add Kitto Flora
1047
1048 } 1046 }
1049 if (PhysicsVector.isFinite(vec)) 1047 if (PhysicsVector.isFinite(vec))
1050 { 1048 {
@@ -1080,8 +1078,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1080 _parent_scene.geom_name_map.Remove(Shell); 1078 _parent_scene.geom_name_map.Remove(Shell);
1081 Shell = IntPtr.Zero; 1079 Shell = IntPtr.Zero;
1082 } 1080 }
1083
1084 return;
1085 } 1081 }
1086 } 1082 }
1087 1083