Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

1 files changed, 21 insertions, 17 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 02a163f..e86887d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -497,7 +497,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool IsRestrictedFromLand(UUID avatar)
         {
-            ExpireAccessList();
+            if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) == 0)
+                return false;
 
             if (m_scene.Permissions.IsAdministrator(avatar))
                 return false;
@@ -508,24 +509,27 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (avatar == LandData.OwnerID)
                 return false;
 
-            if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
-            {
-                if (LandData.ParcelAccessList.FindIndex(
-                        delegate(LandAccessEntry e)
-                        {
-                            if (e.AgentID == avatar && e.Flags == AccessList.Access)
-                                return true;
-                            return false;
-                        }) == -1)
-                {
-                    if (!HasGroupAccess(avatar))
+            if (HasGroupAccess(avatar))
+                return false;
+
+            return (!IsInLandAccessList(avatar));
+        }
+
+        public bool IsInLandAccessList(UUID avatar)
+        {
+            ExpireAccessList();
+
+            if (LandData.ParcelAccessList.FindIndex(
+                    delegate(LandAccessEntry e)
                     {
-                        return true;
-                    }
-                }
+                        if (e.AgentID == avatar && e.Flags == AccessList.Access)
+                            return true;
+                        return false;
+                    }) == -1)
+            {
+                return false;
             }
-
-            return false;
+            return true;
         }
 
         public void SendLandUpdateToClient(IClientAPI remote_client)