diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Services/Interfaces/IInventoryService.cs | |
parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz |
*remove conflicts
Diffstat (limited to 'OpenSim/Services/Interfaces/IInventoryService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IInventoryService.cs | 24 |
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 | |||
149 | /// <returns>true if the item was successfully deleted</returns> | 149 | /// <returns>true if the item was successfully deleted</returns> |
150 | bool DeleteItem(InventoryItemBase item); | 150 | bool DeleteItem(InventoryItemBase item); |
151 | 151 | ||
152 | InventoryItemBase QueryItem(InventoryItemBase item); | 152 | /// <summary> |
153 | /// Get an item, given by its UUID | ||
154 | /// </summary> | ||
155 | /// <param name="item"></param> | ||
156 | /// <returns></returns> | ||
157 | InventoryItemBase GetItem(InventoryItemBase item); | ||
153 | 158 | ||
154 | InventoryFolderBase QueryFolder(InventoryFolderBase folder); | 159 | /// <summary> |
160 | /// Get a folder, given by its UUID | ||
161 | /// </summary> | ||
162 | /// <param name="folder"></param> | ||
163 | /// <returns></returns> | ||
164 | InventoryFolderBase GetFolder(InventoryFolderBase folder); | ||
155 | 165 | ||
156 | /// <summary> | 166 | /// <summary> |
157 | /// Does the given user have an inventory structure? | 167 | /// Does the given user have an inventory structure? |
@@ -166,5 +176,15 @@ namespace OpenSim.Services.Interfaces | |||
166 | /// <param name="userId"></param> | 176 | /// <param name="userId"></param> |
167 | /// <returns></returns> | 177 | /// <returns></returns> |
168 | List<InventoryItemBase> GetActiveGestures(UUID userId); | 178 | List<InventoryItemBase> GetActiveGestures(UUID userId); |
179 | |||
180 | /// <summary> | ||
181 | /// Get the union of permissions of all inventory items | ||
182 | /// that hold the given assetID. | ||
183 | /// </summary> | ||
184 | /// <param name="userID"></param> | ||
185 | /// <param name="assetID"></param> | ||
186 | /// <returns>The permissions or 0 if no such asset is found in | ||
187 | /// the user's inventory</returns> | ||
188 | int GetAssetPermissions(UUID userID, UUID assetID); | ||
169 | } | 189 | } |
170 | } | 190 | } |