aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMagnuz Binder2015-03-20 18:43:42 +0100
committerRobert Adams2015-03-22 09:53:27 -0700
commit07a75677c3100ff6c3444d68f6f6039b70bac65d (patch)
tree23e0400355d21057af0305c915b4b77b6cf1708a /OpenSim
parentAllow setting holesize to 0.01 from scripts just like from viewer. (diff)
downloadopensim-SC-07a75677c3100ff6c3444d68f6f6039b70bac65d.zip
opensim-SC-07a75677c3100ff6c3444d68f6f6039b70bac65d.tar.gz
opensim-SC-07a75677c3100ff6c3444d68f6f6039b70bac65d.tar.bz2
opensim-SC-07a75677c3100ff6c3444d68f6f6039b70bac65d.tar.xz
Allow setting hollow to 99% from scripts just like from viewer.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs6
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6ccf86d..f075d50 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7450,12 +7450,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7450 hollow = 0.70f; 7450 hollow = 0.70f;
7451 } 7451 }
7452 } 7452 }
7453 // Otherwise, hollow is limited to 95%. 7453 // Otherwise, hollow is limited to 99%.
7454 else 7454 else
7455 { 7455 {
7456 if (hollow > 0.95f) 7456 if (hollow > 0.99f)
7457 { 7457 {
7458 hollow = 0.95f; 7458 hollow = 0.99f;
7459 } 7459 }
7460 } 7460 }
7461 shapeBlock.ProfileHollow = (ushort)(50000 * hollow); 7461 shapeBlock.ProfileHollow = (ushort)(50000 * hollow);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
index d7651e3..caf2b05 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
@@ -209,11 +209,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
209 ScriptBaseClass.PRIM_TYPE_BOX, // Prim type 209 ScriptBaseClass.PRIM_TYPE_BOX, // Prim type
210 ScriptBaseClass.PRIM_HOLE_TRIANGLE, // Prim hole type 210 ScriptBaseClass.PRIM_HOLE_TRIANGLE, // Prim hole type
211 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut 211 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
212 0.95f, // Prim hollow 212 0.99f, // Prim hollow
213 new LSL_Types.Vector3(1.0d, 0.0d, 0.0d), // Prim twist 213 new LSL_Types.Vector3(1.0d, 0.0d, 0.0d), // Prim twist
214 new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper 214 new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper
215 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 215 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear
216 0.95f); // Prim hollow check 216 0.99f); // Prim hollow check
217 217
218 // Test a tube. 218 // Test a tube.
219 CheckllSetPrimitiveParams( 219 CheckllSetPrimitiveParams(
@@ -246,7 +246,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
246 ScriptBaseClass.PRIM_TYPE_PRISM, // Prim type 246 ScriptBaseClass.PRIM_TYPE_PRISM, // Prim type
247 ScriptBaseClass.PRIM_HOLE_SQUARE, // Prim hole type 247 ScriptBaseClass.PRIM_HOLE_SQUARE, // Prim hole type
248 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut 248 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
249 0.95f, // Prim hollow 249 0.99f, // Prim hollow
250 // Expression for x selected to test precision problems during sbyte 250 // Expression for x selected to test precision problems during sbyte
251 // cast in SetPrimitiveShapeBlockParams. 251 // cast in SetPrimitiveShapeBlockParams.
252 new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d), // Prim twist 252 new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d), // Prim twist