diff options
author | teravus | 2013-10-05 17:36:58 -0500 |
---|---|---|
committer | teravus | 2013-10-05 17:36:58 -0500 |
commit | ece2d24077cacba677de5cebdd3a9da463306ecd (patch) | |
tree | 9f85591639a2f039b52f869be371b1f3c4363b37 /OpenSim/Region/CoreModules/Avatar | |
parent | Merge branch 'master' of careminster:/var/git/careminster (diff) | |
download | opensim-SC_OLD-ece2d24077cacba677de5cebdd3a9da463306ecd.zip opensim-SC_OLD-ece2d24077cacba677de5cebdd3a9da463306ecd.tar.gz opensim-SC_OLD-ece2d24077cacba677de5cebdd3a9da463306ecd.tar.bz2 opensim-SC_OLD-ece2d24077cacba677de5cebdd3a9da463306ecd.tar.xz |
* Fixes cases where Last Attachment Point gets overwritten with 0 when it shouldn't
* Fixes cases where Last Attachment Point doesn't get written when it should.
* Fixes Null Reference in BaseHttpServer when shutting down, null path provided.
* Drop then Wear retains Last Attachment Point
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 81a7278..051e959 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -685,6 +685,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
685 | if (changed && m_scene.AvatarFactory != null) | 685 | if (changed && m_scene.AvatarFactory != null) |
686 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); | 686 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); |
687 | 687 | ||
688 | so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint; | ||
689 | |||
688 | sp.RemoveAttachment(so); | 690 | sp.RemoveAttachment(so); |
689 | so.FromItemID = UUID.Zero; | 691 | so.FromItemID = UUID.Zero; |
690 | 692 | ||
@@ -699,7 +701,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
699 | so.ClearPartAttachmentData(); | 701 | so.ClearPartAttachmentData(); |
700 | rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false); | 702 | rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false); |
701 | so.HasGroupChanged = true; | 703 | so.HasGroupChanged = true; |
702 | so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint; | ||
703 | rootPart.Rezzed = DateTime.Now; | 704 | rootPart.Rezzed = DateTime.Now; |
704 | rootPart.RemFlag(PrimFlags.TemporaryOnRez); | 705 | rootPart.RemFlag(PrimFlags.TemporaryOnRez); |
705 | so.AttachToBackup(); | 706 | so.AttachToBackup(); |