aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorteravus2013-10-05 17:36:58 -0500
committerteravus2013-10-05 17:36:58 -0500
commitece2d24077cacba677de5cebdd3a9da463306ecd (patch)
tree9f85591639a2f039b52f869be371b1f3c4363b37 /OpenSim/Region/Framework
parentMerge branch 'master' of careminster:/var/git/careminster (diff)
downloadopensim-SC-ece2d24077cacba677de5cebdd3a9da463306ecd.zip
opensim-SC-ece2d24077cacba677de5cebdd3a9da463306ecd.tar.gz
opensim-SC-ece2d24077cacba677de5cebdd3a9da463306ecd.tar.bz2
opensim-SC-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/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6deb870..997a1be 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1667,7 +1667,8 @@ namespace OpenSim.Region.Framework.Scenes
1667 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); 1667 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1668 if (avatar == null) 1668 if (avatar == null)
1669 return; 1669 return;
1670 1670 m_rootPart.Shape.LastAttachPoint = m_rootPart.Shape.State;
1671 m_rootPart.AttachedPos = m_rootPart.OffsetPosition;
1671 avatar.RemoveAttachment(this); 1672 avatar.RemoveAttachment(this);
1672 1673
1673 Vector3 detachedpos = new Vector3(127f,127f,127f); 1674 Vector3 detachedpos = new Vector3(127f,127f,127f);
@@ -2107,6 +2108,7 @@ namespace OpenSim.Region.Framework.Scenes
2107 2108
2108 if (RootPart.Shape.PCode == 9 && RootPart.Shape.State != 0) 2109 if (RootPart.Shape.PCode == 9 && RootPart.Shape.State != 0)
2109 { 2110 {
2111 RootPart.Shape.LastAttachPoint = RootPart.Shape.State;
2110 RootPart.Shape.State = 0; 2112 RootPart.Shape.State = 0;
2111 ScheduleGroupForFullUpdate(); 2113 ScheduleGroupForFullUpdate();
2112 } 2114 }