aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-10-11 15:17:49 +0000
committerHomer Horwitz2008-10-11 15:17:49 +0000
commit6452c6c20b0cc1f971167e3b54696e369d1c3a83 (patch)
tree79d925b5c1a92859c7d66aae4bcb9b8ca6170cd6
parent* Removed Heartbeat timer (diff)
downloadopensim-SC_OLD-6452c6c20b0cc1f971167e3b54696e369d1c3a83.zip
opensim-SC_OLD-6452c6c20b0cc1f971167e3b54696e369d1c3a83.tar.gz
opensim-SC_OLD-6452c6c20b0cc1f971167e3b54696e369d1c3a83.tar.bz2
opensim-SC_OLD-6452c6c20b0cc1f971167e3b54696e369d1c3a83.tar.xz
Add a + operator to LSLString, otherwise you will end up with CIL strings if
you have expressions with strings.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 5f8b541..2d79901 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1346,6 +1346,11 @@ namespace OpenSim.Region.ScriptEngine.Shared
1346 return s1.m_string != s2; 1346 return s1.m_string != s2;
1347 } 1347 }
1348 1348
1349 public static LSLString operator +(LSLString s1, LSLString s2)
1350 {
1351 return new LSLString(s1.m_string + s2.m_string);
1352 }
1353
1349 public static explicit operator double(LSLString s) 1354 public static explicit operator double(LSLString s)
1350 { 1355 {
1351 return Convert.ToDouble(s.m_string); 1356 return Convert.ToDouble(s.m_string);