When casting strings to int, use double.Parse() as strings may be floats. With

this commit, issue 1822 should be fixed.

2 files changed, 8 insertions, 4 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 74c9935..d0a5079 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -1172,7 +1172,8 @@ namespace OpenSim.Region.ScriptEngine.Common
 
             public static explicit operator LSLInteger(LSLString s)
             {
-                return new LSLInteger(Convert.ToInt32(s.m_string));
+                // double.Parse() used because s could be "123.9" for example.
+                return new LSLInteger(double.Parse(s.m_string));
             }
 
             public static explicit operator LSLString(double d)
@@ -1283,7 +1284,8 @@ namespace OpenSim.Region.ScriptEngine.Common
 
             static public explicit operator LSLInteger(string s)
             {
-                return new LSLInteger(int.Parse(s));
+                // double.Parse() used because s could be "123.9" for example.
+                return new LSLInteger(double.Parse(s));
             }
 
             static public implicit operator LSLInteger(uint u)
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 57394d9..c42e3e6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1172,7 +1172,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public static explicit operator LSLInteger(LSLString s)
             {
-                return new LSLInteger(Convert.ToInt32(s.m_string));
+                // double.Parse() used because s could be "123.9" for example.
+                return new LSLInteger(double.Parse(s.m_string));
             }
 
             public static explicit operator LSLString(double d)
@@ -1283,7 +1284,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             static public explicit operator LSLInteger(string s)
             {
-                return new LSLInteger(int.Parse(s));
+                // double.Parse() used because s could be "123.9" for example.
+                return new LSLInteger(double.Parse(s));
             }
 
             static public implicit operator LSLInteger(uint u)