diff options
author | John Hurliman | 2010-04-22 18:56:06 -0700 |
---|---|---|
committer | John Hurliman | 2010-04-22 18:56:06 -0700 |
commit | 8692ac53f56c8db9942021709e7415b2b2add0c6 (patch) | |
tree | 5681611d23f8f89b38d2c19ef032d412fd3fe3d2 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | * Better error logging for failed SimianGrid web service calls (diff) | |
parent | Insert a ROLLBACK command on migration step failure. This ensures that (diff) | |
download | opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.zip opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.gz opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.bz2 opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 57 |
1 files changed, 56 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 23828ef..f050dcf 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -30,6 +30,7 @@ using System.Reflection; | |||
30 | using log4net; | 30 | using log4net; |
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenMetaverse.Packets; | ||
33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework; | 35 | using OpenSim.Region.Framework; |
35 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
@@ -169,6 +170,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
169 | return true; | 170 | return true; |
170 | } | 171 | } |
171 | 172 | ||
173 | public void RezMultipleAttachmentsFromInventory( | ||
174 | IClientAPI remoteClient, | ||
175 | RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | ||
176 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects) | ||
177 | { | ||
178 | foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects) | ||
179 | { | ||
180 | RezSingleAttachmentFromInventory(remoteClient, obj.ItemID, obj.AttachmentPt); | ||
181 | } | ||
182 | } | ||
183 | |||
172 | public UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 184 | public UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
173 | { | 185 | { |
174 | m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing single attachment from item {0} for {1}", itemID, remoteClient.Name); | 186 | m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing single attachment from item {0} for {1}", itemID, remoteClient.Name); |
@@ -227,6 +239,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
227 | // Fire after attach, so we don't get messy perms dialogs | 239 | // Fire after attach, so we don't get messy perms dialogs |
228 | // 3 == AttachedRez | 240 | // 3 == AttachedRez |
229 | objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 3); | 241 | objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 3); |
242 | objatt.ResumeScripts(); | ||
230 | 243 | ||
231 | // Do this last so that event listeners have access to all the effects of the attachment | 244 | // Do this last so that event listeners have access to all the effects of the attachment |
232 | m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId); | 245 | m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId); |
@@ -311,6 +324,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
311 | } | 324 | } |
312 | } | 325 | } |
313 | 326 | ||
327 | public void DetachObject(uint objectLocalID, IClientAPI remoteClient) | ||
328 | { | ||
329 | SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID); | ||
330 | if (group != null) | ||
331 | { | ||
332 | //group.DetachToGround(); | ||
333 | ShowDetachInUserInventory(group.GetFromItemID(), remoteClient); | ||
334 | } | ||
335 | } | ||
336 | |||
314 | public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient) | 337 | public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient) |
315 | { | 338 | { |
316 | ScenePresence presence; | 339 | ScenePresence presence; |
@@ -329,6 +352,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
329 | DetachSingleAttachmentToInv(itemID, remoteClient); | 352 | DetachSingleAttachmentToInv(itemID, remoteClient); |
330 | } | 353 | } |
331 | 354 | ||
355 | public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient) | ||
356 | { | ||
357 | SceneObjectPart part = m_scene.GetSceneObjectPart(itemID); | ||
358 | if (part == null || part.ParentGroup == null) | ||
359 | return; | ||
360 | |||
361 | UUID inventoryID = part.ParentGroup.GetFromItemID(); | ||
362 | |||
363 | ScenePresence presence; | ||
364 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) | ||
365 | { | ||
366 | if (!m_scene.Permissions.CanRezObject( | ||
367 | part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) | ||
368 | return; | ||
369 | |||
370 | presence.Appearance.DetachAttachment(itemID); | ||
371 | |||
372 | if (m_scene.AvatarFactory != null) | ||
373 | { | ||
374 | m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); | ||
375 | } | ||
376 | part.ParentGroup.DetachToGround(); | ||
377 | |||
378 | List<UUID> uuids = new List<UUID>(); | ||
379 | uuids.Add(inventoryID); | ||
380 | m_scene.InventoryService.DeleteItems(remoteClient.AgentId, uuids); | ||
381 | remoteClient.SendRemoveInventoryItem(inventoryID); | ||
382 | } | ||
383 | |||
384 | m_scene.EventManager.TriggerOnAttach(part.ParentGroup.LocalId, itemID, UUID.Zero); | ||
385 | } | ||
386 | |||
332 | // What makes this method odd and unique is it tries to detach using an UUID.... Yay for standards. | 387 | // What makes this method odd and unique is it tries to detach using an UUID.... Yay for standards. |
333 | // To LocalId or UUID, *THAT* is the question. How now Brown UUID?? | 388 | // To LocalId or UUID, *THAT* is the question. How now Brown UUID?? |
334 | protected void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient) | 389 | protected void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient) |
@@ -359,4 +414,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
359 | } | 414 | } |
360 | } | 415 | } |
361 | } | 416 | } |
362 | } \ No newline at end of file | 417 | } |