From 0e3fce9b5c26ee21dee64f8667e7b47b71dbdb3a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 4 Jul 2012 21:25:58 +0100
Subject: refactor: In llGetInventoryKey() use existing GetInventoryItem()
---
.../Shared/Api/Implementation/LSL_Api.cs | 24 ++++++++--------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f57f752..b0602fc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4703,22 +4703,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
m_host.AddScriptLPS(1);
- lock (m_host.TaskInventory)
+ TaskInventoryItem item = m_host.Inventory.GetInventoryItem(name);
+
+ if (item == null)
+ return UUID.Zero.ToString();
+
+ if ((item.CurrentPermissions
+ & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
+ == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
{
- foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
- {
- if (inv.Value.Name == name)
- {
- if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
- {
- return inv.Value.AssetID.ToString();
- }
- else
- {
- return UUID.Zero.ToString();
- }
- }
- }
+ return item.AssetID.ToString();
}
return UUID.Zero.ToString();
--
cgit v1.1