From 82fa53a486b16687131a0f85ba02b579b5456f3a Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Mon, 28 Jul 2008 02:36:18 +0000 Subject: -copy LSL_Types tests from Common/ to Shared/ -fix some whitespace/formatting --- OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 6 +++--- OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 5607706..bb1fe2f 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -1285,7 +1285,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return new LSLInteger(u); } - + static public explicit operator LSLInteger(double d) { return new LSLInteger(d); @@ -1322,7 +1322,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return new LSLInteger(i1.value / i2); } - + static public LSLFloat operator +(LSLInteger i1, double f) { return new LSLFloat((double)i1.value + f); @@ -1510,7 +1510,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return new LSLFloat(f.value / (double)i); } - + static public LSLFloat operator +(LSLFloat lhs, LSLFloat rhs) { return new LSLFloat(lhs.value + rhs.value); diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 398e73d..89722da 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -1280,7 +1280,7 @@ namespace OpenSim.Region.ScriptEngine.Shared { return new LSLInteger(int.Parse(s)); } - + static public implicit operator LSLInteger(uint u) { return new LSLInteger(u); @@ -1347,7 +1347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared { return new LSLInteger(-i.value); } - + public override bool Equals(Object o) { if (!(o is LSLInteger)) @@ -1362,7 +1362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared static public LSLInteger operator &(LSLInteger i1, LSLInteger i2) { - int ret = i1.value & i2.value; + int ret = i1.value & i2.value; return ret; } @@ -1505,7 +1505,7 @@ namespace OpenSim.Region.ScriptEngine.Shared { return new LSLFloat(f.value * (double)i); } - + static public LSLFloat operator /(LSLFloat f, int i) { return new LSLFloat(f.value / (double)i); @@ -1535,12 +1535,12 @@ namespace OpenSim.Region.ScriptEngine.Shared { return new LSLFloat(-f.value); } - + static public implicit operator System.Double(LSLFloat f) { return f.value; } - + #endregion #region Overriders -- cgit v1.1