From 4d3a8f4b522c0e41487a26593488aef043732956 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Tue, 1 Jan 2008 15:28:16 +0000 Subject: Fixed nant compile problem --- OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/ScriptEngine') diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index b008acb..0ae7a0a 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -599,14 +599,23 @@ namespace OpenSim.Region.ScriptEngine.Common return new LSLString(s); } - public static bool operator ==(LSLString s1, LSLString s2) - { - return s1.m_string == s2.m_string; - } - public static bool operator !=(LSLString s1, LSLString s2) - { - return s1.m_string != s2.m_string; - } + // Commented out: + /* + [echo] Build Directory is /home/tedd/opensim/trunk/OpenSim/Region/ScriptEngine/Common/bin/Debug + [csc] Compiling 5 files to '/home/tedd/opensim/trunk/OpenSim/Region/ScriptEngine/Common/bin/Debug/OpenSim.Region.ScriptEngine.Common.dll'. + [csc] error CS0121: The call is ambiguous between the following methods or properties: `OpenSim.Region.ScriptEngine.Common.LSL_Types.LSLString.operator /(OpenSim.Region.ScriptEngine.Common.LSL_Types.LSLString, OpenSim.Region.ScriptEngine.Common.LSL_Types.LSLString)' and `string.operator /(string, string)' + [csc] /home/tedd/opensim/trunk/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs(602,32): (Location of the symbol related to previous error) + [csc] /usr/lib/mono/2.0/mscorlib.dll (Location of the symbol related to previous error) + [csc] Compilation failed: 1 error(s), 0 warnings + */ + //public static bool operator ==(LSLString s1, LSLString s2) + //{ + // return s1.m_string == s2.m_string; + //} + //public static bool operator !=(LSLString s1, LSLString s2) + //{ + // return s1.m_string != s2.m_string; + //} #endregion #region Overriders -- cgit v1.1