OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a HGsuitcase API

0.9.1.0-post-fixes
UbitUmarov 2019-09-23 15:59:15 +01:00
parent 43b56eaf08
commit 64834a880d
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
View File

@ -399,6 +399,7 @@ namespace OpenSim.Services.HypergridService
return false; return false;
} }
// currently not in use
public InventoryItemBase GetItem(InventoryItemBase item) public InventoryItemBase GetItem(InventoryItemBase item)
{ {
InventoryItemBase it = base.GetItem(item.Owner, item.ID); InventoryItemBase it = base.GetItem(item.Owner, item.ID);
@ -426,6 +427,33 @@ namespace OpenSim.Services.HypergridService
return it; 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) public new InventoryFolderBase GetFolder(UUID principalID, UUID folderID)
{ {
InventoryFolderBase f = base.GetFolder(principalID, folderID); InventoryFolderBase f = base.GetFolder(principalID, folderID);