diff options
author | Justin Clark-Casey (justincc) | 2011-10-04 22:49:06 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-04 22:49:06 +0100 |
commit | 8a216dc1ccdc336a22958cd476de034d065cf676 (patch) | |
tree | 4deca739b301d8414a5c3e632becf568af4deeb6 /OpenSim/Region/Framework/Interfaces | |
parent | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. (diff) | |
parent | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... (diff) | |
download | opensim-SC_OLD-8a216dc1ccdc336a22958cd476de034d065cf676.zip opensim-SC_OLD-8a216dc1ccdc336a22958cd476de034d065cf676.tar.gz opensim-SC_OLD-8a216dc1ccdc336a22958cd476de034d065cf676.tar.bz2 opensim-SC_OLD-8a216dc1ccdc336a22958cd476de034d065cf676.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 1a0423f..e668dae 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -28,7 +28,6 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using OpenMetaverse.Packets; | ||
32 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
33 | using OpenSim.Region.Framework.Scenes; | 32 | using OpenSim.Region.Framework.Scenes; |
34 | 33 | ||
@@ -40,6 +39,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
40 | /// RezAttachments. This should only be called upon login on the first region. | 39 | /// 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. | 40 | /// Attachment rezzings on crossings and TPs are done in a different way. |
42 | /// </summary> | 41 | /// </summary> |
42 | /// <param name="sp"></param> | ||
43 | void RezAttachments(IScenePresence sp); | 43 | void RezAttachments(IScenePresence sp); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
@@ -50,17 +50,16 @@ namespace OpenSim.Region.Framework.Interfaces | |||
50 | 50 | ||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Delete all the presence's attachments from the scene | 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). | 53 | /// This is done when a root agent leaves/is demoted to child (for instance, on logout, teleport or region cross). |
56 | /// </param> | 54 | /// </summary> |
55 | /// <param name="sp"></param> | ||
57 | /// <param name="silent"></param> | 56 | /// <param name="silent"></param> |
58 | void DeleteAttachmentsFromScene(IScenePresence sp, bool silent); | 57 | void DeleteAttachmentsFromScene(IScenePresence sp, bool silent); |
59 | 58 | ||
60 | /// <summary> | 59 | /// <summary> |
61 | /// Attach an object to an avatar | 60 | /// Attach an object to an avatar |
62 | /// </summary> | 61 | /// </summary> |
63 | /// <param name="remoteClient"></param> | 62 | /// <param name="sp"></param> |
64 | /// <param name="grp"></param> | 63 | /// <param name="grp"></param> |
65 | /// <param name="AttachmentPt"></param> | 64 | /// <param name="AttachmentPt"></param> |
66 | /// <param name="silent"></param> | 65 | /// <param name="silent"></param> |
@@ -80,34 +79,22 @@ namespace OpenSim.Region.Framework.Interfaces | |||
80 | /// Rez multiple attachments from a user's inventory | 79 | /// Rez multiple attachments from a user's inventory |
81 | /// </summary> | 80 | /// </summary> |
82 | /// <param name="sp"></param> | 81 | /// <param name="sp"></param> |
83 | /// <param name="header"></param> | 82 | /// <param name="rezlist"></param> |
84 | /// <param name="objects"></param> | ||
85 | void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist); | 83 | void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist); |
86 | |||
87 | /// <summary> | ||
88 | /// Detach an object from the avatar. | ||
89 | /// </summary> | ||
90 | /// <remarks> | ||
91 | /// This method is called in response to a client's detach request, so we only update the information in | ||
92 | /// inventory | ||
93 | /// </remarks> | ||
94 | /// <param name="objectLocalID"></param> | ||
95 | /// <param name="remoteClient"></param> | ||
96 | void DetachObject(uint objectLocalID, IClientAPI remoteClient); | ||
97 | 84 | ||
98 | /// <summary> | 85 | /// <summary> |
99 | /// Detach the given item to the ground. | 86 | /// Detach the given item to the ground. |
100 | /// </summary> | 87 | /// </summary> |
101 | /// <param name="sp"></param> | 88 | /// <param name="sp"></param> |
102 | /// <param name="objectLocalID"></param> | 89 | /// <param name="objectLocalID"></param> |
103 | void DetachSingleAttachmentToGround(IScenePresence sp, uint objectLocalID); | 90 | void DetachSingleAttachmentToGround(IScenePresence sp, uint objectLocalID); |
104 | 91 | ||
105 | /// <summary> | 92 | /// <summary> |
106 | /// Detach the given item so that it remains in the user's inventory. | 93 | /// Detach the given item so that it remains in the user's inventory. |
107 | /// </summary> | 94 | /// </summary> |
108 | /// <param name="itemID">/param> | 95 | /// <param name="sp">/param> |
109 | /// <param name="remoteClient"></param> | 96 | /// <param name="itemID"></param> |
110 | void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient); | 97 | void DetachSingleAttachmentToInv(IScenePresence sp, UUID itemID); |
111 | 98 | ||
112 | /// <summary> | 99 | /// <summary> |
113 | /// Update the position of an attachment. | 100 | /// Update the position of an attachment. |