2 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 7bd4fa7..1e26036 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -365,8 +365,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         protected object ConvertFromLSL(object lslparm, Type type, string fname)
         {
+            
+            if(lslparm.GetType() == type)
+                return lslparm;
+
             // ---------- String ----------
-            if (lslparm is LSL_String)
+            else if (lslparm is LSL_String)
             {
                 if (type == typeof(string))
                     return (string)(LSL_String)lslparm;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
index 20bbd72..fe2113b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
@@ -270,7 +270,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 
             LSL_Types.Quaternion testValue = new LSL_Types.Quaternion(12.64, 59.43723, 765.3421, 4.00987);
-            // make that nonesense a quartenion
+            // make that nonsense a quaternion
             testValue.Normalize();
             LSL_Types.list testList = new LSL_Types.list(testValue);