aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorubit2012-05-19 01:21:39 +0200
committerubit2012-05-19 01:21:39 +0200
commit294cbca5e661811bf9ff5683f90b2f0ec494efc2 (patch)
tree2a35bca621caa62a5e9d514d1711df57f0f03bac /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentadd colliders relative velocity projected in collision direction to collision... (diff)
downloadopensim-SC-294cbca5e661811bf9ff5683f90b2f0ec494efc2.zip
opensim-SC-294cbca5e661811bf9ff5683f90b2f0ec494efc2.tar.gz
opensim-SC-294cbca5e661811bf9ff5683f90b2f0ec494efc2.tar.bz2
opensim-SC-294cbca5e661811bf9ff5683f90b2f0ec494efc2.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index b0711d7..bfff3d4 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -903,6 +903,7 @@ namespace OpenSim.Region.Physics.OdePlugin
903 contact.SurfaceNormal.X = 0f; 903 contact.SurfaceNormal.X = 0f;
904 contact.SurfaceNormal.Y = 0f; 904 contact.SurfaceNormal.Y = 0f;
905 contact.SurfaceNormal.Z = -1f; 905 contact.SurfaceNormal.Z = -1f;
906 contact.RelativeSpeed = -vel.Z;
906 AddCollisionEvent(0, contact); 907 AddCollisionEvent(0, contact);
907 908
908 vec.Z *= 0.5f; 909 vec.Z *= 0.5f;