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.

---
 OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs')

diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 40eb6d4..7f14e8e 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -383,7 +383,7 @@ namespace OpenSim.Services.HypergridService
             // Check the items' current folders
             foreach (InventoryItemBase item in items)
             {
-                InventoryItemBase originalItem = base.GetItem(item);
+                InventoryItemBase originalItem = base.GetItem(item.Owner, item.ID);
                 if (!IsWithinSuitcaseTree(originalItem.Owner, originalItem.Folder))
                 {
                     m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveItems: folder {0} (user {1}) is not within Suitcase tree", item.Folder, item.Owner);
@@ -401,7 +401,7 @@ namespace OpenSim.Services.HypergridService
 
         public new InventoryItemBase GetItem(InventoryItemBase item)
         {
-            InventoryItemBase it = base.GetItem(item);
+            InventoryItemBase it = base.GetItem(item.Owner, item.ID);
             if (it == null)
             {
                 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to retrieve item {0} ({1}) in folder {2}",
@@ -426,9 +426,9 @@ namespace OpenSim.Services.HypergridService
             return it;
         }
 
-        public new InventoryFolderBase GetFolder(InventoryFolderBase folder)
+        public new InventoryFolderBase GetFolder(UUID principalID, UUID folderID)
         {
-            InventoryFolderBase f = base.GetFolder(folder);
+            InventoryFolderBase f = base.GetFolder(principalID, folderID);
 
             if (f != null)
             {
-- 
cgit v1.1