diff options
| author | UbitUmarov | 2014-09-29 23:24:22 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-09-29 23:24:22 +0100 |
| commit | 1b2e2a86a3e54ef9437697f7460924f64d986b7c (patch) | |
| tree | 2a4a8a045c69a27ee0fc99cf54e6b8a9df6a0213 /OpenSim | |
| parent | Merge branch 'master' into ubitworkmaster (diff) | |
| download | opensim-SC_OLD-1b2e2a86a3e54ef9437697f7460924f64d986b7c.zip opensim-SC_OLD-1b2e2a86a3e54ef9437697f7460924f64d986b7c.tar.gz opensim-SC_OLD-1b2e2a86a3e54ef9437697f7460924f64d986b7c.tar.bz2 opensim-SC_OLD-1b2e2a86a3e54ef9437697f7460924f64d986b7c.tar.xz | |
remove check of other prim top height on steps climb code
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 4a98df4..992fae7 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
| @@ -909,12 +909,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 909 | } | 909 | } |
| 910 | return true; | 910 | return true; |
| 911 | } | 911 | } |
| 912 | 912 | /* | |
| 913 | d.AABB aabb; | 913 | d.AABB aabb; |
| 914 | d.GeomGetAABB(other,out aabb); | 914 | d.GeomGetAABB(other,out aabb); |
| 915 | float othertop = aabb.MaxZ - _position.Z; | 915 | float othertop = aabb.MaxZ - _position.Z; |
| 916 | 916 | */ | |
| 917 | if (offset.Z > 0 || othertop > -feetOff || contact.normal.Z > 0.35f) | 917 | // if (offset.Z > 0 || othertop > -feetOff || contact.normal.Z > 0.35f) |
| 918 | if (offset.Z > 0 || contact.normal.Z > 0.35f) | ||
| 918 | { | 919 | { |
| 919 | if (offset.Z <= 0) | 920 | if (offset.Z <= 0) |
| 920 | { | 921 | { |