diff options
author | Melanie Thielker | 2014-07-20 01:52:26 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-07-20 01:52:26 +0200 |
commit | bef76bf3c59f920a62cd34ae43f3a5327a40b696 (patch) | |
tree | 9bb6e60f39256f64baea2596bfbdf1c07ac56772 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | Fix coalesced objects not showing up as "piles" of prims (AVN only bug) (diff) | |
download | opensim-SC_OLD-bef76bf3c59f920a62cd34ae43f3a5327a40b696.zip opensim-SC_OLD-bef76bf3c59f920a62cd34ae43f3a5327a40b696.tar.gz opensim-SC_OLD-bef76bf3c59f920a62cd34ae43f3a5327a40b696.tar.bz2 opensim-SC_OLD-bef76bf3c59f920a62cd34ae43f3a5327a40b696.tar.xz |
Fix duplicate attach message being sent to objects picked up from the ground
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index d47ca4b..0825a01 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -715,6 +715,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
715 | } | 715 | } |
716 | 716 | ||
717 | m_scene.EventManager.TriggerOnAttach(so.LocalId, so.UUID, UUID.Zero); | 717 | m_scene.EventManager.TriggerOnAttach(so.LocalId, so.UUID, UUID.Zero); |
718 | |||
719 | // Attach (NULL) stops scripts. We don't want that. Resume them. | ||
720 | so.ResumeScripts(); | ||
718 | } | 721 | } |
719 | 722 | ||
720 | public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so) | 723 | public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so) |
@@ -1244,7 +1247,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1244 | + ", AttachmentPoint: " + AttachmentPt); | 1247 | + ", AttachmentPoint: " + AttachmentPt); |
1245 | 1248 | ||
1246 | // Save avatar attachment information | 1249 | // Save avatar attachment information |
1247 | m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId); | 1250 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); |
1248 | } | 1251 | } |
1249 | } | 1252 | } |
1250 | catch (Exception e) | 1253 | catch (Exception e) |