From 64834a880d6eded2c5fce7a0bbad596318f83382 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 23 Sep 2019 15:59:15 +0100 Subject: [PATCH] fix a HGsuitcase API --- .../HGSuitcaseInventoryService.cs | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 9b332176bc..bdb052d5c2 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs @@ -399,6 +399,7 @@ namespace OpenSim.Services.HypergridService return false; } + // currently not in use public InventoryItemBase GetItem(InventoryItemBase item) { InventoryItemBase it = base.GetItem(item.Owner, item.ID); @@ -426,6 +427,33 @@ namespace OpenSim.Services.HypergridService return it; } + public override InventoryItemBase GetItem(UUID principalID, UUID itemID) + { + InventoryItemBase it = base.GetItem(principalID, itemID); + if (it == null) + { + m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to retrieve item {0}", + itemID); + return null; + } + + if (!IsWithinSuitcaseTree(it.Owner, it.Folder) && !IsPartOfAppearance(it.Owner, it.ID)) + { + m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetItem: item {0}/{1} (folder {2}) (user {3}) is not within Suitcase tree or Appearance", + it.Name, it.ID, it.Folder, it.Owner); + return null; + } + + // UserAccount user = m_Cache.GetUser(it.CreatorId); + + // // Adjust the creator data + // if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) + // it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; + //} + + return it; + } + public new InventoryFolderBase GetFolder(UUID principalID, UUID folderID) { InventoryFolderBase f = base.GetFolder(principalID, folderID);