From ea8f3c83bf96453e8223d918933d5708fa49a3cc Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 4 Jul 2016 03:35:48 +0100
Subject: Finally remove the requirement for an InventoryItem/FolderBase object
 to be passed into inventory queries. This makes the API more homogenous and
 also will more clearly show coding errors related to HG inventory where the
 .Owner field has a meaning for a query but wasn't always set.

---
 .../CoreModules/Framework/Library/LocalInventoryService.cs    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs')

diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
index e1e1838..21e00b2 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
@@ -103,13 +103,8 @@ namespace OpenSim.Region.CoreModules.Framework.Library
         {
             InventoryItemBase[] itemColl = new InventoryItemBase[itemIDs.Length];
             int i = 0;
-            InventoryItemBase item = new InventoryItemBase();
-            item.Owner = principalID;
             foreach (UUID fid in itemIDs)
-            {
-                item.ID = fid;
-                itemColl[i++] = GetItem(item);
-            }
+                itemColl[i++] = GetItem(principalID, fid);
 
             return itemColl;
         }
@@ -239,14 +234,14 @@ namespace OpenSim.Region.CoreModules.Framework.Library
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public InventoryItemBase GetItem(InventoryItemBase item) { return null; }
+        public InventoryItemBase GetItem(UUID principalID, UUID itemID) { return null; }
 
         /// <summary>
         /// Get a folder, given by its UUID
         /// </summary>
         /// <param name="folder"></param>
         /// <returns></returns>
-        public InventoryFolderBase GetFolder(InventoryFolderBase folder) { return null; }
+        public InventoryFolderBase GetFolder(UUID principalID, UUID folderID) { return null; }
 
         /// <summary>
         /// Does the given user have an inventory structure?
-- 
cgit v1.1