diff options
| author | Justin Clark-Casey (justincc) | 2011-08-17 01:35:33 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-17 01:35:33 +0100 |
| commit | acfdca34fd9bf6d66d144ae5c0a325dd5e864517 (patch) | |
| tree | fa04bcde5a48a26ef3867d82019f8f1eb35cb6b8 /OpenSim/Region/CoreModules | |
| parent | extend test to check that there is one attachment and that it has the right name (diff) | |
| download | opensim-SC_OLD-acfdca34fd9bf6d66d144ae5c0a325dd5e864517.zip opensim-SC_OLD-acfdca34fd9bf6d66d144ae5c0a325dd5e864517.tar.gz opensim-SC_OLD-acfdca34fd9bf6d66d144ae5c0a325dd5e864517.tar.bz2 opensim-SC_OLD-acfdca34fd9bf6d66d144ae5c0a325dd5e864517.tar.xz | |
Fix issue where loading a new appearance onto an NPC would not remove the previous attachments from the scene.
Addresses http://opensimulator.org/mantis/view.php?id=5636
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 4dbc5e6..0316d29 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 101 | /// <param name="silent"></param> | 101 | /// <param name="silent"></param> |
| 102 | public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent) | 102 | public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent) |
| 103 | { | 103 | { |
| 104 | m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject"); | 104 | // m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject"); |
| 105 | 105 | ||
| 106 | try | 106 | try |
| 107 | { | 107 | { |
| @@ -466,7 +466,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 466 | { | 466 | { |
| 467 | m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero); | 467 | m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero); |
| 468 | group.DetachToInventoryPrep(); | 468 | group.DetachToInventoryPrep(); |
| 469 | m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString()); | 469 | // m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString()); |
| 470 | 470 | ||
| 471 | // If an item contains scripts, it's always changed. | 471 | // If an item contains scripts, it's always changed. |
| 472 | // This ensures script state is saved on detach | 472 | // This ensures script state is saved on detach |