aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-06-22 23:40:59 +0100
committerMelanie2010-06-22 23:40:59 +0100
commitce6fbd96806e2f8b3828f062192e5b4ce6de6ed3 (patch)
treee5c96c43547eeb4b7d7fb37791d9e75f04472c83
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-ce6fbd96806e2f8b3828f062192e5b4ce6de6ed3.zip
opensim-SC_OLD-ce6fbd96806e2f8b3828f062192e5b4ce6de6ed3.tar.gz
opensim-SC_OLD-ce6fbd96806e2f8b3828f062192e5b4ce6de6ed3.tar.bz2
opensim-SC_OLD-ce6fbd96806e2f8b3828f062192e5b4ce6de6ed3.tar.xz
Merge branch 'master' into careminster-presence-refactor
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs28
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 7e57603..7d7320d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6889,15 +6889,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6889 if (cut.y > 1f) 6889 if (cut.y > 1f)
6890 { 6890 {
6891 cut.y = 1f; 6891 cut.y = 1f;
6892 } 6892 }
6893 if (cut.y - cut.x < 0.05f) 6893 if (cut.y - cut.x < 0.05f)
6894 { 6894 {
6895 cut.x = cut.y - 0.05f; 6895 cut.x = cut.y - 0.05f;
6896 if (cut.x < 0.0f) 6896 if (cut.x < 0.0f)
6897 { 6897 {
6898 cut.x = 0.0f; 6898 cut.x = 0.0f;
6899 cut.y = 0.05f; 6899 cut.y = 0.05f;
6900 } 6900 }
6901 } 6901 }
6902 shapeBlock.ProfileBegin = (ushort)(50000 * cut.x); 6902 shapeBlock.ProfileBegin = (ushort)(50000 * cut.x);
6903 shapeBlock.ProfileEnd = (ushort)(50000 * (1 - cut.y)); 6903 shapeBlock.ProfileEnd = (ushort)(50000 * (1 - cut.y));
@@ -7104,11 +7104,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7104 } 7104 }
7105 if (profilecut.y - profilecut.x < 0.05f) 7105 if (profilecut.y - profilecut.x < 0.05f)
7106 { 7106 {
7107 profilecut.x = profilecut.y - 0.05f; 7107 profilecut.x = profilecut.y - 0.05f;
7108 if (profilecut.x < 0.0f) 7108 if (profilecut.x < 0.0f)
7109 { 7109 {
7110 profilecut.x = 0.0f; 7110 profilecut.x = 0.0f;
7111 profilecut.y = 0.05f; 7111 profilecut.y = 0.05f;
7112 } 7112 }
7113 } 7113 }
7114 shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x); 7114 shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x);