aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMike Mazur2008-07-31 00:29:19 +0000
committerMike Mazur2008-07-31 00:29:19 +0000
commit1c8f4905735ff7653313f725fea13bf6346d1389 (patch)
tree4fb37932b1dc8da15adc1d13ea802f0396f3a513 /OpenSim/Region
parentThank you, HomerHorwitz, for a patch that (diff)
downloadopensim-SC_OLD-1c8f4905735ff7653313f725fea13bf6346d1389.zip
opensim-SC_OLD-1c8f4905735ff7653313f725fea13bf6346d1389.tar.gz
opensim-SC_OLD-1c8f4905735ff7653313f725fea13bf6346d1389.tar.bz2
opensim-SC_OLD-1c8f4905735ff7653313f725fea13bf6346d1389.tar.xz
More LSL_Types implicit/explicit cast changes. Fix issue 1854.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs6
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index d0a5079..b8a4a4d 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -1439,12 +1439,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1439 1439
1440 #region Operators 1440 #region Operators
1441 1441
1442 static public implicit operator int(LSLFloat f) 1442 static public explicit operator int(LSLFloat f)
1443 { 1443 {
1444 return (int)f.value; 1444 return (int)f.value;
1445 } 1445 }
1446 1446
1447 static public implicit operator uint(LSLFloat f) 1447 static public explicit operator uint(LSLFloat f)
1448 { 1448 {
1449 return (uint) Math.Abs(f.value); 1449 return (uint) Math.Abs(f.value);
1450 } 1450 }
@@ -1471,7 +1471,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1471 return new LSLFloat(i.value); 1471 return new LSLFloat(i.value);
1472 } 1472 }
1473 1473
1474 static public implicit operator LSLFloat(string s) 1474 static public explicit operator LSLFloat(string s)
1475 { 1475 {
1476 return new LSLFloat(double.Parse(s)); 1476 return new LSLFloat(double.Parse(s));
1477 } 1477 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index c42e3e6..25f6957 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1439,12 +1439,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
1439 1439
1440 #region Operators 1440 #region Operators
1441 1441
1442 static public implicit operator int(LSLFloat f) 1442 static public explicit operator int(LSLFloat f)
1443 { 1443 {
1444 return (int)f.value; 1444 return (int)f.value;
1445 } 1445 }
1446 1446
1447 static public implicit operator uint(LSLFloat f) 1447 static public explicit operator uint(LSLFloat f)
1448 { 1448 {
1449 return (uint) Math.Abs(f.value); 1449 return (uint) Math.Abs(f.value);
1450 } 1450 }
@@ -1471,7 +1471,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1471 return new LSLFloat(i.value); 1471 return new LSLFloat(i.value);
1472 } 1472 }
1473 1473
1474 static public implicit operator LSLFloat(string s) 1474 static public explicit operator LSLFloat(string s)
1475 { 1475 {
1476 return new LSLFloat(double.Parse(s)); 1476 return new LSLFloat(double.Parse(s));
1477 } 1477 }