From 1c7accf9500250abad243eaeb6f6baadf7644e78 Mon Sep 17 00:00:00 2001
From: teravus
Date: Sat, 24 Aug 2013 05:55:53 -0500
Subject: * Fix a null ref that causes a stack unwind when crossing borders. 
 Less stack unwinding..   the faster it goes. * Tweak XEngine so that it's
 partially functional again.    It's still not great, but basic things work.
 (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)

---
 OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 343cdb5..c52d586 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -182,6 +182,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             try
             {
                 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                if (obj == null)
+                    return;
                 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0
                     || avatar.Scene.RegionInfo.RegionSettings.AllowDamage)
                 {
-- 
cgit v1.1


From ece2d24077cacba677de5cebdd3a9da463306ecd Mon Sep 17 00:00:00 2001
From: teravus
Date: Sat, 5 Oct 2013 17:36:58 -0500
Subject: * 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

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

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
                 if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
 
+                so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
+                
                 sp.RemoveAttachment(so);
                 so.FromItemID = UUID.Zero;
 
@@ -699,7 +701,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 so.ClearPartAttachmentData();
                 rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false);
                 so.HasGroupChanged = true;
-                so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
                 rootPart.Rezzed = DateTime.Now;
                 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
                 so.AttachToBackup();
-- 
cgit v1.1