diff options
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 62 |
1 files changed, 37 insertions, 25 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 788f42b..6bbdd7d 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -37,6 +37,27 @@ namespace OpenSim.Region.Framework.Interfaces | |||
37 | public interface IAttachmentsModule | 37 | public interface IAttachmentsModule |
38 | { | 38 | { |
39 | /// <summary> | 39 | /// <summary> |
40 | /// RezAttachments. This should only be called upon login on the first region. | ||
41 | /// Attachment rezzings on crossings and TPs are done in a different way. | ||
42 | /// </summary> | ||
43 | void RezAttachments(IScenePresence sp); | ||
44 | |||
45 | /// <summary> | ||
46 | /// Save the attachments that have change on this presence. | ||
47 | /// </summary> | ||
48 | /// <param name="sp"></param> | ||
49 | void SaveChangedAttachments(IScenePresence sp); | ||
50 | |||
51 | /// <summary> | ||
52 | /// Delete all the presence's attachments from the scene | ||
53 | /// </summary> | ||
54 | /// <param name="sp"> | ||
55 | /// This is done when a root agent leaves/is demoted to child (for instance, on logout, teleport or region cross). | ||
56 | /// </param> | ||
57 | /// <param name="silent"></param> | ||
58 | void DeleteAttachmentsFromScene(IScenePresence sp, bool silent); | ||
59 | |||
60 | /// <summary> | ||
40 | /// Attach an object to an avatar from the world. | 61 | /// Attach an object to an avatar from the world. |
41 | /// </summary> | 62 | /// </summary> |
42 | /// <param name="controllingClient"></param> | 63 | /// <param name="controllingClient"></param> |
@@ -48,13 +69,11 @@ namespace OpenSim.Region.Framework.Interfaces | |||
48 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); | 69 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); |
49 | 70 | ||
50 | /// <summary> | 71 | /// <summary> |
51 | /// Attach an object to an avatar. | 72 | /// Attach an object to an avatar |
52 | /// </summary> | 73 | /// </summary> |
53 | /// <param name="controllingClient"></param> | 74 | /// <param name="remoteClient"></param> |
54 | /// <param name="localID"></param> | 75 | /// <param name="grp"></param> |
55 | /// <param name="attachPoint"></param> | 76 | /// <param name="AttachmentPt"></param> |
56 | /// <param name="rot"></param> | ||
57 | /// <param name="attachPos"></param> | ||
58 | /// <param name="silent"></param> | 77 | /// <param name="silent"></param> |
59 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 78 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
60 | bool AttachObject( | 79 | bool AttachObject( |
@@ -67,7 +86,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
67 | /// <param name="itemID"></param> | 86 | /// <param name="itemID"></param> |
68 | /// <param name="AttachmentPt"></param> | 87 | /// <param name="AttachmentPt"></param> |
69 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> | 88 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> |
70 | UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); | 89 | ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); |
71 | 90 | ||
72 | /// <summary> | 91 | /// <summary> |
73 | /// Rez an attachment from user inventory | 92 | /// Rez an attachment from user inventory |
@@ -80,7 +99,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
80 | /// False is required so that we don't attempt to update information when a user enters a scene with the | 99 | /// False is required so that we don't attempt to update information when a user enters a scene with the |
81 | /// attachment already correctly set up in inventory. | 100 | /// attachment already correctly set up in inventory. |
82 | /// <returns>The uuid of the scene object that was attached. Null if the scene object could not be found</returns> | 101 | /// <returns>The uuid of the scene object that was attached. Null if the scene object could not be found</returns> |
83 | UUID RezSingleAttachmentFromInventory( | 102 | ISceneEntity RezSingleAttachmentFromInventory( |
84 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus); | 103 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus); |
85 | 104 | ||
86 | // Same as above, but also load script states from a separate doc | 105 | // Same as above, but also load script states from a separate doc |
@@ -101,9 +120,10 @@ namespace OpenSim.Region.Framework.Interfaces | |||
101 | /// <summary> | 120 | /// <summary> |
102 | /// Detach an object from the avatar. | 121 | /// Detach an object from the avatar. |
103 | /// </summary> | 122 | /// </summary> |
104 | /// | 123 | /// <remarks> |
105 | /// This method is called in response to a client's detach request, so we only update the information in | 124 | /// This method is called in response to a client's detach request, so we only update the information in |
106 | /// inventory | 125 | /// inventory |
126 | /// </remarks> | ||
107 | /// <param name="objectLocalID"></param> | 127 | /// <param name="objectLocalID"></param> |
108 | /// <param name="remoteClient"></param> | 128 | /// <param name="remoteClient"></param> |
109 | void DetachObject(uint objectLocalID, IClientAPI remoteClient); | 129 | void DetachObject(uint objectLocalID, IClientAPI remoteClient); |
@@ -111,12 +131,12 @@ namespace OpenSim.Region.Framework.Interfaces | |||
111 | /// <summary> | 131 | /// <summary> |
112 | /// Detach the given item to the ground. | 132 | /// Detach the given item to the ground. |
113 | /// </summary> | 133 | /// </summary> |
114 | /// <param name="itemID"></param> | 134 | /// <param name="objectLocalID"></param> |
115 | /// <param name="remoteClient"></param> | 135 | /// <param name="remoteClient"></param> |
116 | void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient); | 136 | void DetachSingleAttachmentToGround(uint objectLocalID, IClientAPI remoteClient); |
117 | 137 | ||
118 | /// <summary> | 138 | /// <summary> |
119 | /// Update the user inventory to show a detach. | 139 | /// Detach the given item so that it remains in the user's inventory. |
120 | /// </summary> | 140 | /// </summary> |
121 | /// <param name="itemID"> | 141 | /// <param name="itemID"> |
122 | /// A <see cref="UUID"/> | 142 | /// A <see cref="UUID"/> |
@@ -124,23 +144,15 @@ namespace OpenSim.Region.Framework.Interfaces | |||
124 | /// <param name="remoteClient"> | 144 | /// <param name="remoteClient"> |
125 | /// A <see cref="IClientAPI"/> | 145 | /// A <see cref="IClientAPI"/> |
126 | /// </param> | 146 | /// </param> |
127 | void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient); | 147 | void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient); |
128 | 148 | ||
129 | /// <summary> | 149 | /// <summary> |
130 | /// Update the user inventory with a changed attachment | 150 | /// Update the user inventory with a changed attachment |
131 | /// </summary> | 151 | /// </summary> |
132 | /// <param name="remoteClient"> | 152 | /// <param name="remoteClient"></param> |
133 | /// A <see cref="IClientAPI"/> | 153 | /// <param name="grp"></param> |
134 | /// </param> | 154 | /// <param name="itemID"></param> |
135 | /// <param name="grp"> | 155 | /// <param name="agentID"></param> |
136 | /// A <see cref="SceneObjectGroup"/> | ||
137 | /// </param> | ||
138 | /// <param name="itemID"> | ||
139 | /// A <see cref="UUID"/> | ||
140 | /// </param> | ||
141 | /// <param name="agentID"> | ||
142 | /// A <see cref="UUID"/> | ||
143 | /// </param> | ||
144 | void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID); | 156 | void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID); |
145 | } | 157 | } |
146 | } | 158 | } |