diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs index 305975e..da11e61 100644 --- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs | |||
@@ -59,7 +59,15 @@ namespace OpenSim.Region.Framework.Interfaces | |||
59 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 59 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
60 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | 60 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); |
61 | void TransferInventoryAssets(InventoryItemBase item, UUID sender, UUID receiver); | 61 | void TransferInventoryAssets(InventoryItemBase item, UUID sender, UUID receiver); |
62 | bool GetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID); | 62 | |
63 | /// <summary> | ||
64 | /// Does the client have sufficient permissions to retrieve the inventory item? | ||
65 | /// </summary> | ||
66 | /// <param name="remoteClient"></param> | ||
67 | /// <param name="itemID"></param> | ||
68 | /// <param name="requestID"></param> | ||
69 | /// <returns></returns> | ||
70 | bool CanGetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID); | ||
63 | 71 | ||
64 | // Must be here because of textures in user's inventory | 72 | // Must be here because of textures in user's inventory |
65 | bool IsForeignUser(UUID userID, out string assetServerURL); | 73 | bool IsForeignUser(UUID userID, out string assetServerURL); |