aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMike Mazur2008-07-27 07:09:33 +0000
committerMike Mazur2008-07-27 07:09:33 +0000
commit11a3fbf4aa058ae0ec50a2aa0bea12e33e96b14b (patch)
tree481b884671141c04a694a901c6f7f54c2945ed9c
parentImplement LSLFloat {+,-,*,/} LSLFloat operations. Fix issues 1532, 1701, 1824 & (diff)
downloadopensim-SC_OLD-11a3fbf4aa058ae0ec50a2aa0bea12e33e96b14b.zip
opensim-SC_OLD-11a3fbf4aa058ae0ec50a2aa0bea12e33e96b14b.tar.gz
opensim-SC_OLD-11a3fbf4aa058ae0ec50a2aa0bea12e33e96b14b.tar.bz2
opensim-SC_OLD-11a3fbf4aa058ae0ec50a2aa0bea12e33e96b14b.tar.xz
Conversion from double to LSLInteger needs to be explicit. Fix issue 1826.
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index d5211f5..5607706 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -1286,7 +1286,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1286 return new LSLInteger(u); 1286 return new LSLInteger(u);
1287 } 1287 }
1288 1288
1289 static public implicit operator LSLInteger(double d) 1289 static public explicit operator LSLInteger(double d)
1290 { 1290 {
1291 return new LSLInteger(d); 1291 return new LSLInteger(d);
1292 } 1292 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 77bb426..ea2a551 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1314,7 +1314,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1314 return new LSLInteger(u); 1314 return new LSLInteger(u);
1315 } 1315 }
1316 1316
1317 static public implicit operator LSLInteger(double d) 1317 static public explicit operator LSLInteger(double d)
1318 { 1318 {
1319 return new LSLInteger(d); 1319 return new LSLInteger(d);
1320 } 1320 }