diff options
| author | Melanie | 2012-07-29 16:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-29 16:11:20 +0100 |
| commit | e012c81d7c883fda33edb1094dd165214804bff9 (patch) | |
| tree | 4ef031a39490ef0202a298190b5168ac99213944 /OpenSim/Region/Physics | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Return world rotation on llGetObjectDetails()'s OBJECT_ROT (diff) | |
| download | opensim-SC_OLD-e012c81d7c883fda33edb1094dd165214804bff9.zip opensim-SC_OLD-e012c81d7c883fda33edb1094dd165214804bff9.tar.gz opensim-SC_OLD-e012c81d7c883fda33edb1094dd165214804bff9.tar.bz2 opensim-SC_OLD-e012c81d7c883fda33edb1094dd165214804bff9.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index a554897..f3ac3ca 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -1027,7 +1027,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1027 | { | 1027 | { |
| 1028 | d.AABB aabb; | 1028 | d.AABB aabb; |
| 1029 | d.GeomGetAABB(g2, out aabb); | 1029 | d.GeomGetAABB(g2, out aabb); |
| 1030 | float tmp = vtmp.Z - sz * .25f; | 1030 | float tmp = vtmp.Z - sz * .18f; |
| 1031 | 1031 | ||
| 1032 | if (aabb.MaxZ < tmp) | 1032 | if (aabb.MaxZ < tmp) |
| 1033 | { | 1033 | { |
| @@ -1057,7 +1057,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1057 | { | 1057 | { |
| 1058 | d.AABB aabb; | 1058 | d.AABB aabb; |
| 1059 | d.GeomGetAABB(g1, out aabb); | 1059 | d.GeomGetAABB(g1, out aabb); |
| 1060 | float tmp = vtmp.Z - sz * .25f; | 1060 | float tmp = vtmp.Z - sz * .18f; |
| 1061 | 1061 | ||
| 1062 | if (aabb.MaxZ < tmp) | 1062 | if (aabb.MaxZ < tmp) |
| 1063 | { | 1063 | { |