From a4281ca014c80ca516e514e9fde9bb3a13e10c97 Mon Sep 17 00:00:00 2001 From: Mic Bowman Date: Fri, 20 Jul 2012 10:48:51 -0700 Subject: Enables support for UUIDs to be returned in lists from modInvoke commands. Thanks SignpostMarv!!! --- .../ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index 4bd3dff..7844c75 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs @@ -200,24 +200,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api for (int i = 0; i < result.Length; i++) { if (result[i] is string) + { llist[i] = new LSL_String((string)result[i]); + } else if (result[i] is int) + { llist[i] = new LSL_Integer((int)result[i]); + } else if (result[i] is float) + { llist[i] = new LSL_Float((float)result[i]); + } + else if (result[i] is UUID) + { + llist[i] = new LSL_Key(result[i].ToString()); + } else if (result[i] is OpenMetaverse.Vector3) { OpenMetaverse.Vector3 vresult = (OpenMetaverse.Vector3)result[i]; - llist[i] = new LSL_Vector(vresult.X,vresult.Y,vresult.Z); + llist[i] = new LSL_Vector(vresult.X, vresult.Y, vresult.Z); } else if (result[i] is OpenMetaverse.Quaternion) { OpenMetaverse.Quaternion qresult = (OpenMetaverse.Quaternion)result[i]; - llist[i] = new LSL_Rotation(qresult.X,qresult.Y,qresult.Z,qresult.W); + llist[i] = new LSL_Rotation(qresult.X, qresult.Y, qresult.Z, qresult.W); } else { - MODError(String.Format("unknown list element returned by {0}",fname)); + MODError(String.Format("unknown list element {1} returned by {0}", fname, result[i].GetType().Name)); } } -- cgit v1.1