ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
root
2011-07-09 01:06:46 +01:00
parent fedfa02b64 e7abf834d1
commit c920ff9d1d
23 changed files with 4291 additions and 4015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -820,7 +820,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;
}
@@ -2043,8 +2043,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));
}
}
}
@@ -2378,8 +2378,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
if (avatar.IsChildAgent == false)
{
result.Add(new LSL_Key(avatar.UUID.ToString()));
result.Add(new LSL_Vector(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z));
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));
}
}