Merge branch 'master' of ../opensim-diva/ into inventory-connector

1 files changed, 22 insertions, 2 deletions

diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index 8058aa7..a89a238 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -149,9 +149,19 @@ namespace OpenSim.Services.Interfaces
         /// <returns>true if the item was successfully deleted</returns>
         bool DeleteItem(InventoryItemBase item);
 
-        InventoryItemBase QueryItem(InventoryItemBase item);
+        /// <summary>
+        /// Get an item, given by its UUID
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        InventoryItemBase GetItem(InventoryItemBase item);
 
-        InventoryFolderBase QueryFolder(InventoryFolderBase folder);
+        /// <summary>
+        /// Get a folder, given by its UUID
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns></returns>
+        InventoryFolderBase GetFolder(InventoryFolderBase folder);
 
         /// <summary>
         /// Does the given user have an inventory structure?
@@ -166,5 +176,15 @@ namespace OpenSim.Services.Interfaces
         /// <param name="userId"></param>
         /// <returns></returns>
         List<InventoryItemBase> GetActiveGestures(UUID userId);
+
+        /// <summary>
+        /// Get the union of permissions of all inventory items
+        /// that hold the given assetID. 
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="assetID"></param>
+        /// <returns>The permissions or 0 if no such asset is found in 
+        /// the user's inventory</returns>
+        int GetAssetPermissions(UUID userID, UUID assetID);
     }
 }