aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-01-01 15:28:16 +0000
committerTedd Hansen2008-01-01 15:28:16 +0000
commit4d3a8f4b522c0e41487a26593488aef043732956 (patch)
tree144fcf5bedebbbe0ef17fd7e3d9b13ebdf3c88a7
parentTrying to fix nant compile error (diff)
downloadopensim-SC_OLD-4d3a8f4b522c0e41487a26593488aef043732956.zip
opensim-SC_OLD-4d3a8f4b522c0e41487a26593488aef043732956.tar.gz
opensim-SC_OLD-4d3a8f4b522c0e41487a26593488aef043732956.tar.bz2
opensim-SC_OLD-4d3a8f4b522c0e41487a26593488aef043732956.tar.xz
Fixed nant compile problem
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs25
1 files changed, 17 insertions, 8 deletions
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
599 return new LSLString(s); 599 return new LSLString(s);
600 } 600 }
601 601
602 public static bool operator ==(LSLString s1, LSLString s2) 602 // Commented out:
603 { 603 /*
604 return s1.m_string == s2.m_string; 604 [echo] Build Directory is /home/tedd/opensim/trunk/OpenSim/Region/ScriptEngine/Common/bin/Debug
605 } 605 [csc] Compiling 5 files to '/home/tedd/opensim/trunk/OpenSim/Region/ScriptEngine/Common/bin/Debug/OpenSim.Region.ScriptEngine.Common.dll'.
606 public static bool operator !=(LSLString s1, LSLString s2) 606 [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)'
607 { 607 [csc] /home/tedd/opensim/trunk/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs(602,32): (Location of the symbol related to previous error)
608 return s1.m_string != s2.m_string; 608 [csc] /usr/lib/mono/2.0/mscorlib.dll (Location of the symbol related to previous error)
609 } 609 [csc] Compilation failed: 1 error(s), 0 warnings
610 */
611 //public static bool operator ==(LSLString s1, LSLString s2)
612 //{
613 // return s1.m_string == s2.m_string;
614 //}
615 //public static bool operator !=(LSLString s1, LSLString s2)
616 //{
617 // return s1.m_string != s2.m_string;
618 //}
610 #endregion 619 #endregion
611 620
612 #region Overriders 621 #region Overriders