diff options
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 620ec22..d781eae 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Xml; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using OpenMetaverse; | 31 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -83,7 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
83 | /// <param name="AttachmentPt"></param> | 84 | /// <param name="AttachmentPt"></param> |
84 | /// <param name="silent"></param> | 85 | /// <param name="silent"></param> |
85 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 86 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
86 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool temp); | 87 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool temp); |
87 | 88 | ||
88 | /// <summary> | 89 | /// <summary> |
89 | /// Rez an attachment from user inventory and change inventory status to match. | 90 | /// Rez an attachment from user inventory and change inventory status to match. |
@@ -92,7 +93,11 @@ namespace OpenSim.Region.Framework.Interfaces | |||
92 | /// <param name="itemID"></param> | 93 | /// <param name="itemID"></param> |
93 | /// <param name="AttachmentPt"></param> | 94 | /// <param name="AttachmentPt"></param> |
94 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> | 95 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> |
95 | SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt); | 96 | ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt); |
97 | |||
98 | // Same as above, but also load script states from a separate doc | ||
99 | ISceneEntity RezSingleAttachmentFromInventory( | ||
100 | IScenePresence presence, UUID itemID, uint AttachmentPt, XmlDocument doc); | ||
96 | 101 | ||
97 | /// <summary> | 102 | /// <summary> |
98 | /// Rez multiple attachments from a user's inventory | 103 | /// Rez multiple attachments from a user's inventory |
@@ -124,7 +129,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
124 | /// <param name="grp">The attachment to detach.</param> | 129 | /// <param name="grp">The attachment to detach.</param> |
125 | void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp); | 130 | void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp); |
126 | 131 | ||
127 | /// <summary> | ||
128 | /// Update the position of an attachment. | 132 | /// Update the position of an attachment. |
129 | /// </summary> | 133 | /// </summary> |
130 | /// <param name="sog"></param> | 134 | /// <param name="sog"></param> |