aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2019-09-23 15:59:15 +0100
committerUbitUmarov2019-09-23 15:59:15 +0100
commit64834a880d6eded2c5fce7a0bbad596318f83382 (patch)
treea17b9782a651f92c97221ac81aa30f8734434c21
parentmake Console Promt(..) compatible with rest of code, again (diff)
downloadopensim-SC-64834a880d6eded2c5fce7a0bbad596318f83382.zip
opensim-SC-64834a880d6eded2c5fce7a0bbad596318f83382.tar.gz
opensim-SC-64834a880d6eded2c5fce7a0bbad596318f83382.tar.bz2
opensim-SC-64834a880d6eded2c5fce7a0bbad596318f83382.tar.xz
fix a HGsuitcase API
-rw-r--r--OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs28
1 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 9b33217..bdb052d 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -399,6 +399,7 @@ namespace OpenSim.Services.HypergridService
399 return false; 399 return false;
400 } 400 }
401 401
402 // currently not in use
402 public InventoryItemBase GetItem(InventoryItemBase item) 403 public InventoryItemBase GetItem(InventoryItemBase item)
403 { 404 {
404 InventoryItemBase it = base.GetItem(item.Owner, item.ID); 405 InventoryItemBase it = base.GetItem(item.Owner, item.ID);
@@ -426,6 +427,33 @@ namespace OpenSim.Services.HypergridService
426 return it; 427 return it;
427 } 428 }
428 429
430 public override InventoryItemBase GetItem(UUID principalID, UUID itemID)
431 {
432 InventoryItemBase it = base.GetItem(principalID, itemID);
433 if (it == null)
434 {
435 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to retrieve item {0}",
436 itemID);
437 return null;
438 }
439
440 if (!IsWithinSuitcaseTree(it.Owner, it.Folder) && !IsPartOfAppearance(it.Owner, it.ID))
441 {
442 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetItem: item {0}/{1} (folder {2}) (user {3}) is not within Suitcase tree or Appearance",
443 it.Name, it.ID, it.Folder, it.Owner);
444 return null;
445 }
446
447 // UserAccount user = m_Cache.GetUser(it.CreatorId);
448
449 // // Adjust the creator data
450 // if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
451 // it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
452 //}
453
454 return it;
455 }
456
429 public new InventoryFolderBase GetFolder(UUID principalID, UUID folderID) 457 public new InventoryFolderBase GetFolder(UUID principalID, UUID folderID)
430 { 458 {
431 InventoryFolderBase f = base.GetFolder(principalID, folderID); 459 InventoryFolderBase f = base.GetFolder(principalID, folderID);