2 files changed, 73 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index a9d1309..366b20c 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4374,10 +4374,45 @@ namespace OpenSim.Region.ScriptEngine.Common
             NotImplemented("llGroundRepel");
         }
 
+        private LLUUID GetTaskInventoryItem(string name)
+        {
+            foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
+            {
+                if(inv.Value.Name == name)
+                    return inv.Key;
+            }
+            return LLUUID.Zero;
+        }
+
         public void llGiveInventoryList(string destination, string category, LSL_Types.list inventory)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGiveInventoryList");
+
+            LLUUID destID;
+            if(!LLUUID.TryParse(destination, out destID))
+                return;
+
+            List<LLUUID> itemList = new List<LLUUID>();
+
+            foreach (Object item in inventory.Data)
+            {
+                LLUUID itemID;
+                if(LLUUID.TryParse(item.ToString(), out itemID))
+                {
+                    itemList.Add(itemID);
+                }
+                else
+                {
+                    itemID = GetTaskInventoryItem(item.ToString());
+                    if(itemID != LLUUID.Zero)
+                        itemList.Add(itemID);
+                }
+            }
+            
+            if(itemList.Count == 0)
+                return;
+
+            m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList);
         }
 
         public void llSetVehicleType(int type)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 57c1e02..1d4a72e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -36,6 +36,7 @@ using Axiom.Math;
 using libsecondlife;
 using OpenSim;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
@@ -4226,10 +4227,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             NotImplemented("llGroundRepel");
         }
 
+        private LLUUID GetTaskInventoryItem(string name)
+        {
+            foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
+            {
+                if(inv.Value.Name == name)
+                    return inv.Key;
+            }
+            return LLUUID.Zero;
+        }
+
         public void llGiveInventoryList(string destination, string category, LSL_Types.list inventory)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGiveInventoryList");
+
+            LLUUID destID;
+            if(!LLUUID.TryParse(destination, out destID))
+                return;
+
+            List<LLUUID> itemList = new List<LLUUID>();
+
+            foreach (Object item in inventory.Data)
+            {
+                LLUUID itemID;
+                if(LLUUID.TryParse(item.ToString(), out itemID))
+                {
+                    itemList.Add(itemID);
+                }
+                else
+                {
+                    itemID = GetTaskInventoryItem(item.ToString());
+                    if(itemID != LLUUID.Zero)
+                        itemList.Add(itemID);
+                }
+            }
+            
+            if(itemList.Count == 0)
+                return;
+
+            m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList);
         }
 
         public void llSetVehicleType(int type)