From e60cf0e67d7f34c5d2a45d98c400b9cdea58752a Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Fri, 25 Jul 2008 04:47:11 +0000 Subject: -add test for newly introduced cast operators (issue 1818) -fix formatting -remove CompilerTest test since it seems to fail randomly --- OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 1 + OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 9bde177..0b28af0 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -1189,6 +1189,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return new Vector3(s.m_string); } + public static implicit operator LSLFloat(LSLString s) { return new LSLFloat(Convert.ToDouble(s.m_string)); diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 73ec9df..f49d453 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -1199,10 +1199,11 @@ namespace OpenSim.Region.ScriptEngine.Shared { return new Vector3(s.m_string); } - public static implicit operator LSLFloat(LSLString s) - { - return new LSLFloat(Convert.ToDouble(s.m_string)); - } + + public static implicit operator LSLFloat(LSLString s) + { + return new LSLFloat(Convert.ToDouble(s.m_string)); + } #endregion -- cgit v1.1