diff options
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEntityInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index 4b17b9a..32f4eea 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
@@ -157,6 +157,15 @@ namespace OpenSim.Region.Framework.Interfaces | |||
157 | TaskInventoryItem GetInventoryItem(UUID itemId); | 157 | TaskInventoryItem GetInventoryItem(UUID itemId); |
158 | 158 | ||
159 | /// <summary> | 159 | /// <summary> |
160 | /// Get all inventory items. | ||
161 | /// </summary> | ||
162 | /// <param name="name"></param> | ||
163 | /// <returns> | ||
164 | /// If there are no inventory items then an empty list is returned. | ||
165 | /// </returns> | ||
166 | List<TaskInventoryItem> GetInventoryItems(); | ||
167 | |||
168 | /// <summary> | ||
160 | /// Get inventory items by name. | 169 | /// Get inventory items by name. |
161 | /// </summary> | 170 | /// </summary> |
162 | /// <param name="name"></param> | 171 | /// <param name="name"></param> |
@@ -164,7 +173,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
164 | /// A list of inventory items with that name. | 173 | /// A list of inventory items with that name. |
165 | /// If no inventory item has that name then an empty list is returned. | 174 | /// If no inventory item has that name then an empty list is returned. |
166 | /// </returns> | 175 | /// </returns> |
167 | IList<TaskInventoryItem> GetInventoryItems(string name); | 176 | List<TaskInventoryItem> GetInventoryItems(string name); |
168 | 177 | ||
169 | /// <summary> | 178 | /// <summary> |
170 | /// Get the scene object referenced by an inventory item. | 179 | /// Get the scene object referenced by an inventory item. |