From d6476b627752c99a6aea5093d080d3633aa6dde8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 26 May 2012 01:03:53 +0100
Subject: Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int
 type).

Also removes small bug where calling this method would add 1 to LPS, evne though all callers already did this.
---
 .../Shared/Api/Implementation/LSL_Api.cs           | 24 +++++++---------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 9908a39..6438bcc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -284,23 +284,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected UUID InventoryKey(string name, int type)
         {
-            m_host.AddScriptLPS(1);
+            TaskInventoryItem item = m_host.Inventory.GetInventoryItem(name);
 
-            lock (m_host.TaskInventory)
-            {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
-                {
-                    if (inv.Value.Name == name)
-                    {
-                        if (inv.Value.Type != type)
-                            return UUID.Zero;
-
-                        return inv.Value.AssetID;
-                    }
-                }
-            }
-
-            return UUID.Zero;
+            if (item != null && item.Type == type)
+                return item.AssetID;
+            else
+                return UUID.Zero;
         }
 
         /// <summary>
@@ -1707,14 +1696,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 return rgb;
             }
+
             if (face >= 0 && face < GetNumberOfSides(part))
             {
                 texcolor = tex.GetFace((uint)face).RGBA;
                 rgb.x = texcolor.R;
                 rgb.y = texcolor.G;
                 rgb.z = texcolor.B;
+                
                 return rgb;
-
             }
             else
             {
-- 
cgit v1.1