diff options
| author | Melanie | 2010-06-22 23:40:12 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-22 23:40:12 +0100 |
| commit | 7db5262e353d3717b7bff25ee63c203252ab2d4d (patch) | |
| tree | 6624541fb80cc4a746c2a1532baa2ca5f4513267 /OpenSim | |
| parent | Guard prioritizer agains null values as those produced by a bullet dying (diff) | |
| parent | Line ending fix (diff) | |
| download | opensim-SC_OLD-7db5262e353d3717b7bff25ee63c203252ab2d4d.zip opensim-SC_OLD-7db5262e353d3717b7bff25ee63c203252ab2d4d.tar.gz opensim-SC_OLD-7db5262e353d3717b7bff25ee63c203252ab2d4d.tar.bz2 opensim-SC_OLD-7db5262e353d3717b7bff25ee63c203252ab2d4d.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 86d0c30..1feb153 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6516,15 +6516,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6516 | if (cut.y > 1f) | 6516 | if (cut.y > 1f) |
| 6517 | { | 6517 | { |
| 6518 | cut.y = 1f; | 6518 | cut.y = 1f; |
| 6519 | } | 6519 | } |
| 6520 | if (cut.y - cut.x < 0.05f) | 6520 | if (cut.y - cut.x < 0.05f) |
| 6521 | { | 6521 | { |
| 6522 | cut.x = cut.y - 0.05f; | 6522 | cut.x = cut.y - 0.05f; |
| 6523 | if (cut.x < 0.0f) | 6523 | if (cut.x < 0.0f) |
| 6524 | { | 6524 | { |
| 6525 | cut.x = 0.0f; | 6525 | cut.x = 0.0f; |
| 6526 | cut.y = 0.05f; | 6526 | cut.y = 0.05f; |
| 6527 | } | 6527 | } |
| 6528 | } | 6528 | } |
| 6529 | shapeBlock.ProfileBegin = (ushort)(50000 * cut.x); | 6529 | shapeBlock.ProfileBegin = (ushort)(50000 * cut.x); |
| 6530 | shapeBlock.ProfileEnd = (ushort)(50000 * (1 - cut.y)); | 6530 | shapeBlock.ProfileEnd = (ushort)(50000 * (1 - cut.y)); |
| @@ -6722,11 +6722,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6722 | } | 6722 | } |
| 6723 | if (profilecut.y - profilecut.x < 0.05f) | 6723 | if (profilecut.y - profilecut.x < 0.05f) |
| 6724 | { | 6724 | { |
| 6725 | profilecut.x = profilecut.y - 0.05f; | 6725 | profilecut.x = profilecut.y - 0.05f; |
| 6726 | if (profilecut.x < 0.0f) | 6726 | if (profilecut.x < 0.0f) |
| 6727 | { | 6727 | { |
| 6728 | profilecut.x = 0.0f; | 6728 | profilecut.x = 0.0f; |
| 6729 | profilecut.y = 0.05f; | 6729 | profilecut.y = 0.05f; |
| 6730 | } | 6730 | } |
| 6731 | } | 6731 | } |
| 6732 | shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x); | 6732 | shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x); |