aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2016-04-27 00:35:30 +0200
committerMelanie Thielker2016-04-27 00:35:30 +0200
commit2c75be7f6e6380264729e15255d59ad4dbe638a0 (patch)
tree8b679d1d9c33dae74305c385b5b5d1630842e1a2
parentRemove a remnant of the optionalmodules unit test that was removed earlier (diff)
downloadopensim-SC-2c75be7f6e6380264729e15255d59ad4dbe638a0.zip
opensim-SC-2c75be7f6e6380264729e15255d59ad4dbe638a0.tar.gz
opensim-SC-2c75be7f6e6380264729e15255d59ad4dbe638a0.tar.bz2
opensim-SC-2c75be7f6e6380264729e15255d59ad4dbe638a0.tar.xz
From information given my Mandarinka Tasty, add firing the detach event even for temp attachments
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index f4e1eae..0cc630f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -779,6 +779,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
779 // on detach. It's likely a temp attachment. 779 // on detach. It's likely a temp attachment.
780 if (so.FromItemID == UUID.Zero) 780 if (so.FromItemID == UUID.Zero)
781 { 781 {
782 // Retirn value is ignored
783 PrepareScriptInstanceForSave(so, true);
784
782 lock (sp.AttachmentsSyncLock) 785 lock (sp.AttachmentsSyncLock)
783 { 786 {
784 bool changed = sp.Appearance.DetachAttachment(so.FromItemID); 787 bool changed = sp.Appearance.DetachAttachment(so.FromItemID);