Merge branch 'SledjChisl'

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index 4289bba..582ea90 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="folderIDs"></param>
         /// <returns>Inventory content.</returns>
         InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs);
-        
+
         /// <summary>
         /// Gets the items inside a folder
         /// </summary>
@@ -161,7 +161,7 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         /// <param name="item"></param>
         /// <returns>null if no item was found, otherwise the found item</returns>
-        InventoryItemBase GetItem(InventoryItemBase item);
+        InventoryItemBase GetItem(UUID userID, UUID itemID);
 
         /// <summary>
         /// Get multiple items, given by their UUIDs
@@ -175,7 +175,7 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         /// <param name="folder"></param>
         /// <returns></returns>
-        InventoryFolderBase GetFolder(InventoryFolderBase folder);
+        InventoryFolderBase GetFolder(UUID userID, UUID folderID);
 
         /// <summary>
         /// Does the given user have an inventory structure?
@@ -193,11 +193,11 @@ namespace OpenSim.Services.Interfaces
 
         /// <summary>
         /// Get the union of permissions of all inventory items
-        /// that hold the given assetID. 
+        /// 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 
+        /// <returns>The permissions or 0 if no such asset is found in
         /// the user's inventory</returns>
         int GetAssetPermissions(UUID userID, UUID assetID);
     }