aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
index 6016530..3c4675c 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
@@ -944,6 +944,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
944 return true; 944 return true;
945 } 945 }
946 946
947 if (gtype == d.GeomClassID.SphereClass)
948 {
949 if(d.GeomSphereGetRadius(other) < 0.5)
950 return true;
951 }
952
947 if (offset.Z > 0 || contact.normal.Z > 0.35f) 953 if (offset.Z > 0 || contact.normal.Z > 0.35f)
948 { 954 {
949 if (offset.Z <= 0) 955 if (offset.Z <= 0)
@@ -980,12 +986,12 @@ namespace OpenSim.Region.PhysicsModule.ubOde
980 offset.Normalize(); 986 offset.Normalize();
981 987
982 float tdp = contact.depth; 988 float tdp = contact.depth;
983 float t = contact.normal.Z * contact.normal.Z; 989 float t = offset.X;
984 t = Math.Abs(t); 990 t = Math.Abs(t);
985 if(t > 1e-6) 991 if(t > 1e-6)
986 { 992 {
987 tdp /= t; 993 tdp /= t;
988 tdp *= offset.Z * offset.Z; 994 tdp *= contact.normal.X;
989 } 995 }
990 else 996 else
991 tdp *= 10; 997 tdp *= 10;