diff options
author | Melanie | 2012-04-13 03:00:48 +0100 |
---|---|---|
committer | Melanie | 2012-04-13 03:00:48 +0100 |
commit | fe65b518765a8c88c1f3067b47d775b9b1142961 (patch) | |
tree | 3a97f13715090d8c925543ae49ecae1930578d5d /OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Mantis 55025 Implement script time. (diff) | |
download | opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.zip opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.gz opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.bz2 opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEntityInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index 4d70888..8732ec0 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
@@ -174,7 +174,17 @@ namespace OpenSim.Region.Framework.Interfaces | |||
174 | /// 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. |
175 | /// </returns> | 175 | /// </returns> |
176 | List<TaskInventoryItem> GetInventoryItems(string name); | 176 | List<TaskInventoryItem> GetInventoryItems(string name); |
177 | 177 | ||
178 | /// <summary> | ||
179 | /// Get inventory items by type. | ||
180 | /// </summary> | ||
181 | /// <param type="name"></param> | ||
182 | /// <returns> | ||
183 | /// A list of inventory items of that type. | ||
184 | /// If no inventory items of that type then an empty list is returned. | ||
185 | /// </returns> | ||
186 | List<TaskInventoryItem> GetInventoryItems(InventoryType type); | ||
187 | |||
178 | /// <summary> | 188 | /// <summary> |
179 | /// Get the scene object referenced by an inventory item. | 189 | /// Get the scene object referenced by an inventory item. |
180 | /// </summary> | 190 | /// </summary> |