aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
diff options
context:
space:
mode:
authorTom2011-09-14 19:11:32 -0700
committerTom2011-09-14 19:11:32 -0700
commit5484c9b585a2a6289456e9492ac2989d489b555c (patch)
treec9b79199722fe09c993c237dce40febf731264e3 /OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
parentMerge fixes, and fix the build (diff)
parentDon't try and delete attachments for child agent close (diff)
downloadopensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.zip
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.gz
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.bz2
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.xz
Bring us up to date.
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs24
1 files changed, 8 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 59c26e7..d1b7dc1 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -89,18 +89,13 @@ namespace OpenSim.Region.Framework.Interfaces
89 ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); 89 ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
90 90
91 /// <summary> 91 /// <summary>
92 /// Rez an attachment from user inventory 92 /// Rez an attachment from user inventory and change inventory status to match.
93 /// </summary> 93 /// </summary>
94 /// <param name="remoteClient"></param> 94 /// <param name="sp"></param>
95 /// <param name="itemID"></param> 95 /// <param name="itemID"></param>
96 /// <param name="AttachmentPt"></param> 96 /// <param name="AttachmentPt"></param>
97 /// <param name="updateinventoryStatus"> 97 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns>
98 /// If true, we also update the user's inventory to show that the attachment is set. If false, we do not. 98 ISceneEntity RezSingleAttachmentFromInventory(ScenePresence sp, UUID itemID, uint AttachmentPt);
99 /// False is required so that we don't attempt to update information when a user enters a scene with the
100 /// attachment already correctly set up in inventory.
101 /// <returns>The uuid of the scene object that was attached. Null if the scene object could not be found</returns>
102 ISceneEntity RezSingleAttachmentFromInventory(
103 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
104 99
105 // Same as above, but also load script states from a separate doc 100 // Same as above, but also load script states from a separate doc
106 ISceneEntity RezSingleAttachmentFromInventory( 101 ISceneEntity RezSingleAttachmentFromInventory(
@@ -146,13 +141,10 @@ namespace OpenSim.Region.Framework.Interfaces
146 /// </param> 141 /// </param>
147 void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient); 142 void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient);
148 143
149 /// <summary> 144 /// Update the position of an attachment.
150 /// Update the user inventory with a changed attachment
151 /// </summary> 145 /// </summary>
152 /// <param name="remoteClient"></param> 146 /// <param name="sog"></param>
153 /// <param name="grp"></param> 147 /// <param name="pos"></param>
154 /// <param name="itemID"></param> 148 void UpdateAttachmentPosition(SceneObjectGroup sog, Vector3 pos);
155 /// <param name="agentID"></param>
156 void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID);
157 } 149 }
158} 150}