diff options
author | Justin Clark-Casey (justincc) | 2010-06-11 21:52:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-11 21:55:18 +0100 |
commit | 3525195bc9b5fdfd9799411edd452981ef1f4ebd (patch) | |
tree | b1749b64b68def578c061496a9be8d3641e215a0 /OpenSim/Services/InventoryService | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-3525195bc9b5fdfd9799411edd452981ef1f4ebd.zip opensim-SC-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.gz opensim-SC-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.bz2 opensim-SC-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.xz |
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r-- | OpenSim/Services/InventoryService/InventoryService.cs | 17 | ||||
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 5 |
2 files changed, 16 insertions, 6 deletions
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs index fbcd663..9f1c4a4 100644 --- a/OpenSim/Services/InventoryService/InventoryService.cs +++ b/OpenSim/Services/InventoryService/InventoryService.cs | |||
@@ -439,15 +439,20 @@ 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 | 442 | ||
443 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) | 443 | public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId) |
444 | { | 444 | { |
445 | InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID); | 445 | InventoryFolderBase result = m_Database.getInventoryFolder(folderId); |
446 | if (result != null) | 446 | if (result != null) |
447 | return result; | 447 | return result; |
448 | 448 | ||
449 | m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID); | 449 | m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId); |
450 | return null; | 450 | return null; |
451 | } | ||
452 | |||
453 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) | ||
454 | { | ||
455 | return GetFolder(folder.ID, folder.Owner); | ||
451 | } | 456 | } |
452 | 457 | ||
453 | public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) | 458 | public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) |
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index af831fd..00aadc5 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -368,6 +368,11 @@ namespace OpenSim.Services.InventoryService | |||
368 | 368 | ||
369 | return ConvertToOpenSim(items[0]); | 369 | return ConvertToOpenSim(items[0]); |
370 | } | 370 | } |
371 | |||
372 | public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId) | ||
373 | { | ||
374 | return GetFolder(new InventoryFolderBase(folderId, userId)); | ||
375 | } | ||
371 | 376 | ||
372 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) | 377 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) |
373 | { | 378 | { |