aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-09 17:23:27 +0000
committerJustin Clarke Casey2008-05-09 17:23:27 +0000
commitd9dffc4a9a1e561921013aa076eee70faa9b7b92 (patch)
tree59b4babe8099169824417572fe007a2bcb96b691 /OpenSim/Region/ScriptEngine
parent* Patch from Jed (DeepThink) - More optimisations for BulletX renderer. Trime... (diff)
downloadopensim-SC_OLD-d9dffc4a9a1e561921013aa076eee70faa9b7b92.zip
opensim-SC_OLD-d9dffc4a9a1e561921013aa076eee70faa9b7b92.tar.gz
opensim-SC_OLD-d9dffc4a9a1e561921013aa076eee70faa9b7b92.tar.bz2
opensim-SC_OLD-d9dffc4a9a1e561921013aa076eee70faa9b7b92.tar.xz
From: Michael Osias <mosias@us.ibm.com>
Stop .net generating ambiguous operator errors when two integers are compared for equality in LSL
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs12
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 09ab5d4..c904b1d 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -1249,6 +1249,18 @@ namespace OpenSim.Region.ScriptEngine.Common
1249 return new LSLInteger(d); 1249 return new LSLInteger(d);
1250 } 1250 }
1251 1251
1252 static public bool operator ==(LSLInteger i1, LSLInteger i2)
1253 {
1254 bool ret = i1.value == i2.value;
1255 return ret;
1256 }
1257
1258 static public bool operator !=(LSLInteger i1, LSLInteger i2)
1259 {
1260 bool ret = i1.value != i2.value;
1261 return ret;
1262 }
1263
1252 static public LSLInteger operator &(LSLInteger i1, LSLInteger i2) 1264 static public LSLInteger operator &(LSLInteger i1, LSLInteger i2)
1253 { 1265 {
1254 int ret = i1.value & i2.value; 1266 int ret = i1.value & i2.value;