-make ZERO_VECTOR and ZERO_ROTATION static readonly properties so they can be

used in scripts
-cast from bool to LSL{Integer,Float,String} so functions such as `integer
isZero(integer x) { return (x == 0); }` work
-progress on issue 1863

6 files changed, 126 insertions, 0 deletions

diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
index 58ca8dd..d89bb87 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
@@ -558,5 +558,26 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
                 }
             }
         }
+
+        /// <summary>
+        /// Tests boolean correctly cast implicitly to LSLFloat.
+        /// </summary>
+        [Test]
+        public void TestImplicitCastBooleanToLSLFloat()
+        {
+            LSL_Types.LSLFloat testFloat;
+
+            testFloat = (1 == 0);
+            Assert.That(testFloat.value, new DoubleToleranceConstraint(0.0, _lowPrecisionTolerance));
+
+            testFloat = (1 == 1);
+            Assert.That(testFloat.value, new DoubleToleranceConstraint(1.0, _lowPrecisionTolerance));
+
+            testFloat = false;
+            Assert.That(testFloat.value, new DoubleToleranceConstraint(0.0, _lowPrecisionTolerance));
+
+            testFloat = true;
+            Assert.That(testFloat.value, new DoubleToleranceConstraint(1.0, _lowPrecisionTolerance));
+        }
     }
 }
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs
index 3f01d09..d2839db 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs
@@ -108,5 +108,26 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
                 Assert.AreEqual(testInteger.value, number.Value);
             }
         }
+
+        /// <summary>
+        /// Tests boolean correctly cast implicitly to LSLInteger.
+        /// </summary>
+        [Test]
+        public void TestImplicitCastBooleanToLSLInteger()
+        {
+            LSL_Types.LSLInteger testInteger;
+
+            testInteger = (1 == 0);
+            Assert.AreEqual(0, testInteger.value);
+
+            testInteger = (1 == 1);
+            Assert.AreEqual(1, testInteger.value);
+
+            testInteger = false;
+            Assert.AreEqual(0, testInteger.value);
+
+            testInteger = true;
+            Assert.AreEqual(1, testInteger.value);
+        }
     }
 }
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs
index 5d4424b..3aa52cb 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs
@@ -111,5 +111,26 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
             Assert.AreEqual(expectedQuaternion, stringQuaternion);
             Assert.AreEqual(expectedQuaternion, LSLStringQuaternion);
         }
+
+        /// <summary>
+        /// Tests boolean correctly cast explicitly to LSLString.
+        /// </summary>
+        [Test]
+        public void TestImplicitCastBooleanToLSLFloat()
+        {
+            LSL_Types.LSLString testString;
+
+            testString = (LSL_Types.LSLString) (1 == 0);
+            Assert.AreEqual("0", testString.m_string);
+
+            testString = (LSL_Types.LSLString) (1 == 1);
+            Assert.AreEqual("1", testString.m_string);
+
+            testString = (LSL_Types.LSLString) false;
+            Assert.AreEqual("0", testString.m_string);
+
+            testString = (LSL_Types.LSLString) true;
+            Assert.AreEqual("1", testString.m_string);
+        }
     }
 }
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs
index d55f0e3..c021963 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs
@@ -558,5 +558,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 }
             }
         }
+
+        /// <summary>
+        /// Tests boolean correctly cast implicitly to LSLFloat.
+        /// </summary>
+        [Test]
+        public void TestImplicitCastBooleanToLSLFloat()
+        {
+            LSL_Types.LSLFloat testFloat;
+
+            testFloat = (1 == 0);
+            Assert.That(testFloat.value, new DoubleToleranceConstraint(0.0, _lowPrecisionTolerance));
+
+            testFloat = (1 == 1);
+            Assert.That(testFloat.value, new DoubleToleranceConstraint(1.0, _lowPrecisionTolerance));
+
+            testFloat = false;
+            Assert.That(testFloat.value, new DoubleToleranceConstraint(0.0, _lowPrecisionTolerance));
+
+            testFloat = true;
+            Assert.That(testFloat.value, new DoubleToleranceConstraint(1.0, _lowPrecisionTolerance));
+        }
     }
 }
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs
index d158084..f826c00 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs
@@ -108,5 +108,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 Assert.AreEqual(testInteger.value, number.Value);
             }
         }
+
+        /// <summary>
+        /// Tests boolean correctly cast implicitly to LSLInteger.
+        /// </summary>
+        [Test]
+        public void TestImplicitCastBooleanToLSLInteger()
+        {
+            LSL_Types.LSLInteger testInteger;
+
+            testInteger = (1 == 0);
+            Assert.AreEqual(0, testInteger.value);
+
+            testInteger = (1 == 1);
+            Assert.AreEqual(1, testInteger.value);
+
+            testInteger = false;
+            Assert.AreEqual(0, testInteger.value);
+
+            testInteger = true;
+            Assert.AreEqual(1, testInteger.value);
+        }
     }
 }
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs
index 8fcb385..49e5023 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs
@@ -111,5 +111,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             Assert.AreEqual(expectedQuaternion, stringQuaternion);
             Assert.AreEqual(expectedQuaternion, LSLStringQuaternion);
         }
+
+        /// <summary>
+        /// Tests boolean correctly cast explicitly to LSLString.
+        /// </summary>
+        [Test]
+        public void TestImplicitCastBooleanToLSLFloat()
+        {
+            LSL_Types.LSLString testString;
+
+            testString = (LSL_Types.LSLString) (1 == 0);
+            Assert.AreEqual("0", testString.m_string);
+
+            testString = (LSL_Types.LSLString) (1 == 1);
+            Assert.AreEqual("1", testString.m_string);
+
+            testString = (LSL_Types.LSLString) false;
+            Assert.AreEqual("0", testString.m_string);
+
+            testString = (LSL_Types.LSLString) true;
+            Assert.AreEqual("1", testString.m_string);
+        }
     }
 }