aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/InventoryService/XInventoryService.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-11 21:52:43 +0100
committerJustin Clark-Casey (justincc)2010-06-11 21:55:18 +0100
commit3525195bc9b5fdfd9799411edd452981ef1f4ebd (patch)
treeb1749b64b68def578c061496a9be8d3641e215a0 /OpenSim/Services/InventoryService/XInventoryService.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-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/XInventoryService.cs')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs5
1 files changed, 5 insertions, 0 deletions
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 {