diff options
Merge branch 'master' into careminster-presence-refactor
This was rather conflicted. Please test linking.
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEntityInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index 1e2f60b..f5cd528 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
@@ -29,6 +29,7 @@ using System.Collections.Generic; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Framework.Scenes; | ||
32 | 33 | ||
33 | namespace OpenSim.Region.Framework.Interfaces | 34 | namespace OpenSim.Region.Framework.Interfaces |
34 | { | 35 | { |
@@ -155,6 +156,17 @@ namespace OpenSim.Region.Framework.Interfaces | |||
155 | /// If no inventory item has that name then an empty list is returned. | 156 | /// If no inventory item has that name then an empty list is returned. |
156 | /// </returns> | 157 | /// </returns> |
157 | IList<TaskInventoryItem> GetInventoryItems(string name); | 158 | IList<TaskInventoryItem> GetInventoryItems(string name); |
159 | |||
160 | /// <summary> | ||
161 | /// Get the scene object referenced by an inventory item. | ||
162 | /// </summary> | ||
163 | /// | ||
164 | /// This is returned in a 'rez ready' state. That is, name, description, permissions and other details have | ||
165 | /// been adjusted to reflect the part and item from which it originates. | ||
166 | /// | ||
167 | /// <param name="item"></param> | ||
168 | /// <returns>The scene object. Null if the scene object asset couldn't be found</returns> | ||
169 | SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item); | ||
158 | 170 | ||
159 | /// <summary> | 171 | /// <summary> |
160 | /// Update an existing inventory item. | 172 | /// Update an existing inventory item. |