diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 85837e4eef..5f8734758c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7022,6 +7022,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return m_host.ParentGroup.AttachmentPoint;
         }
 
+        public LSL_List llGetAttachedList(string id)
+        {
+            m_host.AddScriptLPS(1);
+
+            LSL_List AttachmentsList = new LSL_List();
+
+            ScenePresence av = World.GetScenePresence((UUID)id);
+
+            string NOT_FOUND = "NOT_FOUND";
+            string NOT_ON_REGION = "NOT ON REGION";
+
+            if (av == null)
+                return new LSL_List(NOT_FOUND);
+            if (av.IsChildAgent)
+                return new LSL_List(NOT_ON_REGION);
+
+            List<SceneObjectGroup> AttachmentsKeys;
+
+            AttachmentsKeys = av.GetAttachments();
+
+            foreach (SceneObjectGroup AttachmentKey in AttachmentsKeys)
+                AttachmentsList.Add(new LSL_Key(AttachmentKey.FromItemID.ToString()));
+
+            return AttachmentsList;
+        }
+
         public virtual LSL_Integer llGetFreeMemory()
         {
             m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 8b8638c935..3d1482d921 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -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();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index cea66d2c5f..2769712f2a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -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);