From 01c3be27460fd3f28efd17b8d6606b883350f653 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.

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

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

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