From e7abf834d1b51353ec90f424b87487bbeb391582 Mon Sep 17 00:00:00 2001 From: Makopoppo Date: Mon, 4 Jul 2011 22:45:21 +0900 Subject: Instance-types-in-list fix for LSL/OSSL functions. This will fix llListFindList() which always returns -1 when you compare with the list from those functions. *llCSV2List *llGetAnimationList *llGetLinkPrimitiveParams *llGetObjectDetails *llGetParcelDetails *llGetParcelPrimOwners *llGetPrimitiveParams *GetLinkPrimitiveParamsEx *osGetAgents *osMatchString *osGetLinkPrimitiveParams *osGetPrimitiveParams *osGetAvatarList --- .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 1bc4534..b3f90e2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -811,7 +811,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api World.ForEachScenePresence(delegate(ScenePresence sp) { if (!sp.IsChildAgent) - result.Add(sp.Name); + result.Add(new LSL_String(sp.Name)); }); return result; } @@ -2030,8 +2030,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { if (g.Success) { - result.Add(g.Value); - result.Add(g.Index); + result.Add(new LSL_String(g.Value)); + result.Add(new LSL_Integer(g.Index)); } } } @@ -2365,9 +2365,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { if (avatar.IsChildAgent == false) { - result.Add(avatar.UUID); - result.Add(avatar.AbsolutePosition); - result.Add(avatar.Name); + result.Add(new LSL_String(avatar.UUID.ToString())); + OpenMetaverse.Vector3 ap = avatar.AbsolutePosition; + result.Add(new LSL_Vector(ap.X, ap.Y, ap.Z)); + result.Add(new LSL_String(avatar.Name)); } } }); -- cgit v1.1