OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-11-04 18:31:25 +00:00
parent 0c39a3e348 9b78eb20c0
commit bb32b3b4a1
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -7022,6 +7022,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return m_host.ParentGroup.AttachmentPoint;
}
public LSL_List llGetAttachedList(string id)
{
m_host.AddScriptLPS(1);
ScenePresence av = World.GetScenePresence((UUID)id);
if (av == null || av.IsDeleted)
return new LSL_List("NOT_FOUND");
if (av.IsChildAgent || av.IsInTransit)
return new LSL_List("NOT_ON_REGION");
LSL_List AttachmentsList = new LSL_List();
List<SceneObjectGroup> Attachments;
Attachments = av.GetAttachments();
foreach (SceneObjectGroup Attachment in Attachments)
{
if(Attachment.HasPrivateAttachmentPoint)
continue;
AttachmentsList.Add(new LSL_Key(Attachment.UUID.ToString()));
}
return AttachmentsList;
}
public virtual LSL_Integer llGetFreeMemory()
{
m_host.AddScriptLPS(1);

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@ -116,6 +116,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_String llGetAnimation(string id);
LSL_List llGetAnimationList(string id);
LSL_Integer llGetAttached();
LSL_List llGetAttachedList(string id);
LSL_List llGetBoundingBox(string obj);
LSL_Vector llGetCameraPos();
LSL_Rotation llGetCameraRot();

5
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@ -426,6 +426,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_LSL_Functions.llGetAttached();
}
public LSL_List llGetAttachedList(string id)
{
return m_LSL_Functions.llGetAttachedList(id);
}
public LSL_List llGetBoundingBox(string obj)
{
return m_LSL_Functions.llGetBoundingBox(obj);