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')

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 b41ae0f98f85db76b9a412cee29e9bcba5b4d9d9 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 8 Sep 2013 17:54:00 +0200
Subject: Harmonize the class name, ID and Name of the default perms module

---
 OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 79dd4a0..26e9131 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -42,8 +42,8 @@ using PermissionMask = OpenSim.Framework.PermissionMask;
 
 namespace OpenSim.Region.CoreModules.World.Permissions
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "PermissionsModule")]
-    public class PermissionsModule : INonSharedRegionModule, IPermissionsModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DefaultPermissionsModule")]
+    public class DefaultPermissionsModule : INonSharedRegionModule, IPermissionsModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
                 
@@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         public string Name
         {
-            get { return "PermissionsModule"; }
+            get { return "DefaultPermissionsModule"; }
         }
 
         public Type ReplaceableInterface
-- 
cgit v1.1