diff options
author | UbitUmarov | 2016-08-28 11:28:49 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-28 11:28:49 +0100 |
commit | b2021cf83a532cf61d2f42ad5448d03307876072 (patch) | |
tree | b189d0a575f715962684c22d1bece9e8795177bf /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | mantis: 8008 unscripted child prim collisions didn't trigger scripted root pr... (diff) | |
download | opensim-SC_OLD-b2021cf83a532cf61d2f42ad5448d03307876072.zip opensim-SC_OLD-b2021cf83a532cf61d2f42ad5448d03307876072.tar.gz opensim-SC_OLD-b2021cf83a532cf61d2f42ad5448d03307876072.tar.bz2 opensim-SC_OLD-b2021cf83a532cf61d2f42ad5448d03307876072.tar.xz |
mantis: 8006 remove duplication of attach script events. This is a temporary fix because TriggerOnAttach will not be trigger on attachment from inventory, (for now only Xengine connects to it on core).
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 8f03a0a..fe341c2 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -595,7 +595,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
595 | } | 595 | } |
596 | 596 | ||
597 | // Do this last so that event listeners have access to all the effects of the attachment | 597 | // Do this last so that event listeners have access to all the effects of the attachment |
598 | m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID); | 598 | // this can't be done |
599 | // scripts do internal enqueue of attach even | ||
600 | // and not all scripts are loaded at this point | ||
601 | // m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID); | ||
599 | } | 602 | } |
600 | 603 | ||
601 | return true; | 604 | return true; |
@@ -1318,7 +1321,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1318 | AttachmentPt &= 0x7f; | 1321 | AttachmentPt &= 0x7f; |
1319 | 1322 | ||
1320 | // Calls attach with a Zero position | 1323 | // Calls attach with a Zero position |
1321 | if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, true, append)) | 1324 | SceneObjectGroup group = part.ParentGroup; |
1325 | if (AttachObject(sp, group , AttachmentPt, false, true, append)) | ||
1322 | { | 1326 | { |
1323 | if (DebugLevel > 0) | 1327 | if (DebugLevel > 0) |
1324 | m_log.Debug( | 1328 | m_log.Debug( |
@@ -1327,6 +1331,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1327 | 1331 | ||
1328 | // Save avatar attachment information | 1332 | // Save avatar attachment information |
1329 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); | 1333 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); |
1334 | m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID); | ||
1330 | } | 1335 | } |
1331 | } | 1336 | } |
1332 | catch (Exception e) | 1337 | catch (Exception e) |