Treat LSL_Types as special cases in llList2Integer and llList2Float. This could be implemented many other places, but let's do that on a case-by-case basis.

2 files changed, 36 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 3ae1f3a..3e5e12c 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3421,6 +3421,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             }
             try
             {
+                if (src.Data[index] is LSL_Types.LSLInteger)
+                    return Convert.ToInt32(((LSL_Types.LSLInteger) src.Data[index]).value);
+                else if (src.Data[index] is LSL_Types.LSLFloat)
+                    return Convert.ToInt32(((LSL_Types.LSLFloat) src.Data[index]).value);
+                else if (src.Data[index] is LSL_Types.LSLString)
+                    return Convert.ToInt32(((LSL_Types.LSLString) src.Data[index]).m_string);
                 return Convert.ToInt32(src.Data[index]);
             }
             catch (FormatException)
@@ -3440,6 +3446,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             {
                 return 0.0;
             }
+            if (src.Data[index] is LSL_Types.LSLInteger)
+                return Convert.ToDouble(((LSL_Types.LSLInteger) src.Data[index]).value);
+            else if (src.Data[index] is LSL_Types.LSLFloat)
+                return Convert.ToDouble(((LSL_Types.LSLFloat) src.Data[index]).value);
+            else if (src.Data[index] is LSL_Types.LSLString)
+                return Convert.ToDouble(((LSL_Types.LSLString) src.Data[index]).m_string);
             return Convert.ToDouble(src.Data[index]);
         }
 
@@ -3456,6 +3468,12 @@ namespace OpenSim.Region.ScriptEngine.Common
             }
             try
             {
+                if (src.Data[index] is LSL_Types.LSLInteger)
+                    return Convert.ToDouble(((LSL_Types.LSLInteger) src.Data[index]).value);
+                else if (src.Data[index] is LSL_Types.LSLFloat)
+                    return Convert.ToDouble(((LSL_Types.LSLFloat) src.Data[index]).value);
+                else if (src.Data[index] is LSL_Types.LSLString)
+                    return Convert.ToDouble(((LSL_Types.LSLString) src.Data[index]).m_string);
                 return Convert.ToDouble(src.Data[index]);
             }
             catch (FormatException)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e7313e1..7f24f0e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3363,6 +3363,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             try
             {
+                if (src.Data[index] is LSL_Types.LSLInteger)
+                    return Convert.ToInt32(((LSL_Types.LSLInteger) src.Data[index]).value);
+                else if (src.Data[index] is LSL_Types.LSLFloat)
+                    return Convert.ToInt32(((LSL_Types.LSLFloat) src.Data[index]).value);
+                else if (src.Data[index] is LSL_Types.LSLString)
+                    return Convert.ToInt32(((LSL_Types.LSLString) src.Data[index]).m_string);
                 return Convert.ToInt32(src.Data[index]);
             }
             catch (FormatException)
@@ -3382,6 +3388,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return 0.0;
             }
+            if (src.Data[index] is LSL_Types.LSLInteger)
+                return Convert.ToDouble(((LSL_Types.LSLInteger) src.Data[index]).value);
+            else if (src.Data[index] is LSL_Types.LSLFloat)
+                return Convert.ToDouble(((LSL_Types.LSLFloat) src.Data[index]).value);
+            else if (src.Data[index] is LSL_Types.LSLString)
+                return Convert.ToDouble(((LSL_Types.LSLString) src.Data[index]).m_string);
             return Convert.ToDouble(src.Data[index]);
         }
 
@@ -3398,6 +3410,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             try
             {
+                if (src.Data[index] is LSL_Types.LSLInteger)
+                    return Convert.ToDouble(((LSL_Types.LSLInteger) src.Data[index]).value);
+                else if (src.Data[index] is LSL_Types.LSLFloat)
+                    return Convert.ToDouble(((LSL_Types.LSLFloat) src.Data[index]).value);
+                else if (src.Data[index] is LSL_Types.LSLString)
+                    return Convert.ToDouble(((LSL_Types.LSLString) src.Data[index]).m_string);
                 return Convert.ToDouble(src.Data[index]);
             }
             catch (FormatException)