diff options
author | Justin Clark-Casey (justincc) | 2010-06-11 22:11:33 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-11 22:13:36 +0100 |
commit | 0dce4f1997c57cbdf6bc1f322182c318d3838e40 (patch) | |
tree | d3b564300cefb0de632fa0eadfaed57772c2832e /OpenSim/Services/InventoryService/InventoryService.cs | |
parent | Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(Inve... (diff) | |
download | opensim-SC_OLD-0dce4f1997c57cbdf6bc1f322182c318d3838e40.zip opensim-SC_OLD-0dce4f1997c57cbdf6bc1f322182c318d3838e40.tar.gz opensim-SC_OLD-0dce4f1997c57cbdf6bc1f322182c318d3838e40.tar.bz2 opensim-SC_OLD-0dce4f1997c57cbdf6bc1f322182c318d3838e40.tar.xz |
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
This reverts commit 3525195bc9b5fdfd9799411edd452981ef1f4ebd.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/InventoryService/InventoryService.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs index 9f1c4a4..fbcd663 100644 --- a/OpenSim/Services/InventoryService/InventoryService.cs +++ b/OpenSim/Services/InventoryService/InventoryService.cs | |||
@@ -439,20 +439,15 @@ namespace OpenSim.Services.InventoryService | |||
439 | m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID); | 439 | m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID); |
440 | return null; | 440 | return null; |
441 | } | 441 | } |
442 | |||
443 | public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId) | ||
444 | { | ||
445 | InventoryFolderBase result = m_Database.getInventoryFolder(folderId); | ||
446 | if (result != null) | ||
447 | return result; | ||
448 | |||
449 | m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId); | ||
450 | return null; | ||
451 | } | ||
452 | 442 | ||
453 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) | 443 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) |
454 | { | 444 | { |
455 | return GetFolder(folder.ID, folder.Owner); | 445 | InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID); |
446 | if (result != null) | ||
447 | return result; | ||
448 | |||
449 | m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID); | ||
450 | return null; | ||
456 | } | 451 | } |
457 | 452 | ||
458 | public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) | 453 | public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) |