diff options
Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index d7f0a96..e2a3fa7 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -59,17 +59,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
59 | void DeleteAttachmentsFromScene(IScenePresence sp, bool silent); | 59 | void DeleteAttachmentsFromScene(IScenePresence sp, bool silent); |
60 | 60 | ||
61 | /// <summary> | 61 | /// <summary> |
62 | /// Attach an object to an avatar from the world. | ||
63 | /// </summary> | ||
64 | /// <param name="controllingClient"></param> | ||
65 | /// <param name="localID"></param> | ||
66 | /// <param name="attachPoint"></param> | ||
67 | /// <param name="rot"></param> | ||
68 | /// <param name="silent"></param> | ||
69 | void AttachObject( | ||
70 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); | ||
71 | |||
72 | /// <summary> | ||
73 | /// Attach an object to an avatar | 62 | /// Attach an object to an avatar |
74 | /// </summary> | 63 | /// </summary> |
75 | /// <param name="remoteClient"></param> | 64 | /// <param name="remoteClient"></param> |
@@ -77,17 +66,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
77 | /// <param name="AttachmentPt"></param> | 66 | /// <param name="AttachmentPt"></param> |
78 | /// <param name="silent"></param> | 67 | /// <param name="silent"></param> |
79 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 68 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
80 | bool AttachObject( | 69 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent); |
81 | IClientAPI remoteClient, SceneObjectGroup grp, uint AttachmentPt, bool silent); | ||
82 | |||
83 | /// <summary> | ||
84 | /// Rez an attachment from user inventory and change inventory status to match. | ||
85 | /// </summary> | ||
86 | /// <param name="remoteClient"></param> | ||
87 | /// <param name="itemID"></param> | ||
88 | /// <param name="AttachmentPt"></param> | ||
89 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> | ||
90 | ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); | ||
91 | 70 | ||
92 | /// <summary> | 71 | /// <summary> |
93 | /// Rez an attachment from user inventory and change inventory status to match. | 72 | /// Rez an attachment from user inventory and change inventory status to match. |
@@ -96,7 +75,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
96 | /// <param name="itemID"></param> | 75 | /// <param name="itemID"></param> |
97 | /// <param name="AttachmentPt"></param> | 76 | /// <param name="AttachmentPt"></param> |
98 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> | 77 | /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> |
99 | ISceneEntity RezSingleAttachmentFromInventory(ScenePresence sp, UUID itemID, uint AttachmentPt); | 78 | ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt); |
100 | 79 | ||
101 | // Same as above, but also load script states from a separate doc | 80 | // Same as above, but also load script states from a separate doc |
102 | ISceneEntity RezSingleAttachmentFromInventory( | 81 | ISceneEntity RezSingleAttachmentFromInventory( |
@@ -105,12 +84,10 @@ namespace OpenSim.Region.Framework.Interfaces | |||
105 | /// <summary> | 84 | /// <summary> |
106 | /// Rez multiple attachments from a user's inventory | 85 | /// Rez multiple attachments from a user's inventory |
107 | /// </summary> | 86 | /// </summary> |
108 | /// <param name="remoteClient"></param> | 87 | /// <param name="sp"></param> |
109 | /// <param name="header"></param> | 88 | /// <param name="header"></param> |
110 | /// <param name="objects"></param> | 89 | /// <param name="objects"></param> |
111 | void RezMultipleAttachmentsFromInventory( | 90 | void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist); |
112 | IClientAPI remoteClient, | ||
113 | List<KeyValuePair<UUID, uint>> rezlist); | ||
114 | 91 | ||
115 | /// <summary> | 92 | /// <summary> |
116 | /// Detach an object from the avatar. | 93 | /// Detach an object from the avatar. |
@@ -126,9 +103,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
126 | /// <summary> | 103 | /// <summary> |
127 | /// Detach the given item to the ground. | 104 | /// Detach the given item to the ground. |
128 | /// </summary> | 105 | /// </summary> |
106 | /// <param name="sp"></param> | ||
129 | /// <param name="objectLocalID"></param> | 107 | /// <param name="objectLocalID"></param> |
130 | /// <param name="remoteClient"></param> | 108 | void DetachSingleAttachmentToGround(IScenePresence sp, uint objectLocalID); |
131 | void DetachSingleAttachmentToGround(uint objectLocalID, IClientAPI remoteClient); | ||
132 | 109 | ||
133 | /// <summary> | 110 | /// <summary> |
134 | /// Detach the given item so that it remains in the user's inventory. | 111 | /// Detach the given item so that it remains in the user's inventory. |