diff options
author | Justin Clark-Casey (justincc) | 2010-06-23 01:22:42 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-23 01:22:42 +0100 |
commit | 1719dc9a9b6f87c006c04997005e83c66b134075 (patch) | |
tree | 686d63018385842ace3a614fdd1a05d16806ed63 /OpenSim/Region/ScriptEngine/Shared | |
parent | add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch to... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.zip opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.gz opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.bz2 opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-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); |