diff options
author | John Hurliman | 2010-06-11 15:43:22 -0700 |
---|---|---|
committer | John Hurliman | 2010-06-11 15:43:22 -0700 |
commit | b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be (patch) | |
tree | 95db3efbd631a46c2006fc94dd5ed869ccfcc61a /OpenSim/Services/InventoryService/XInventoryService.cs | |
parent | * Added a new method to IMapImageGenerator for getting the map tile before it... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.zip opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.gz opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.bz2 opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/InventoryService/XInventoryService.cs')
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 00aadc5..af831fd 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -368,11 +368,6 @@ 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 | } | ||
376 | 371 | ||
377 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) | 372 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) |
378 | { | 373 | { |