diff options
author | UbitUmarov | 2016-08-29 10:03:06 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-29 10:03:06 +0100 |
commit | 832758df2bfc161ebca97a25125a85a3a2636617 (patch) | |
tree | 36c9d41e937680f83b44b22067a3f1ae89a89031 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | disable AttacmentsModule tests because they depend on OnAttach event currentl... (diff) | |
download | opensim-SC_OLD-832758df2bfc161ebca97a25125a85a3a2636617.zip opensim-SC_OLD-832758df2bfc161ebca97a25125a85a3a2636617.tar.gz opensim-SC_OLD-832758df2bfc161ebca97a25125a85a3a2636617.tar.bz2 opensim-SC_OLD-832758df2bfc161ebca97a25125a85a3a2636617.tar.xz |
mantis: 8006 restrict the suspention of Trigger OnAttach to the problematic case where scripts are created, and not always as i incorrectly did before. This is still a temporary fix, other modules will not get the notification in that case. But that needs a deeper fix possible in xengine
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index fe341c2..9a6fce9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -594,11 +594,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
594 | group.ResumeScripts(); | 594 | group.ResumeScripts(); |
595 | } | 595 | } |
596 | 596 | ||
597 | else | ||
597 | // Do this last so that event listeners have access to all the effects of the attachment | 598 | // Do this last so that event listeners have access to all the effects of the attachment |
598 | // this can't be done | 599 | // this can't be done when creating scripts: |
599 | // scripts do internal enqueue of attach even | 600 | // scripts do internal enqueue of attach event |
600 | // and not all scripts are loaded at this point | 601 | // and not all scripts are loaded at this point |
601 | // m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID); | 602 | m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID); |
602 | } | 603 | } |
603 | 604 | ||
604 | return true; | 605 | return true; |
@@ -1331,7 +1332,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1331 | 1332 | ||
1332 | // Save avatar attachment information | 1333 | // Save avatar attachment information |
1333 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); | 1334 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); |
1334 | m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID); | ||
1335 | } | 1335 | } |
1336 | } | 1336 | } |
1337 | catch (Exception e) | 1337 | catch (Exception e) |