From 6146e7ef258b10888ad7464b72b75cca701e02c9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 22 Mar 2012 12:57:12 -0700
Subject: Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY
 DEFAULT. Turns out that this can't be expressed by cascading Permission
 modules, so I did it as per this patch.

---
 OpenSim/Framework/ILandObject.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Framework/ILandObject.cs')

diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index dd73b3f..33aad9b 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Framework
         bool ContainsPoint(int x, int y);
         
         ILandObject Copy();
+        ILandObject MemberwiseCopy();
 
         void SendLandUpdateToAvatarsOverMe();
 
@@ -70,6 +71,7 @@ namespace OpenSim.Framework
         void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client);
         bool IsEitherBannedOrRestricted(UUID avatar);
         bool IsBannedFromLand(UUID avatar);
+        bool IsAllowedInLand(UUID avatar);
         bool IsRestrictedFromLand(UUID avatar);
         void SendLandUpdateToClient(IClientAPI remote_client);
         void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
-- 
cgit v1.1


From 45b588cf008c514f461bf43c168dcdc9902b7bb9 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Mar 2012 20:10:38 +0000
Subject: Revert "Simple build permissions feature. NOTE: EXPERIMENTAL,
 DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading
 Permission modules, so I did it as per this patch."

This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
---
 OpenSim/Framework/ILandObject.cs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'OpenSim/Framework/ILandObject.cs')

diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 33aad9b..dd73b3f 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -63,7 +63,6 @@ namespace OpenSim.Framework
         bool ContainsPoint(int x, int y);
         
         ILandObject Copy();
-        ILandObject MemberwiseCopy();
 
         void SendLandUpdateToAvatarsOverMe();
 
@@ -71,7 +70,6 @@ namespace OpenSim.Framework
         void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client);
         bool IsEitherBannedOrRestricted(UUID avatar);
         bool IsBannedFromLand(UUID avatar);
-        bool IsAllowedInLand(UUID avatar);
         bool IsRestrictedFromLand(UUID avatar);
         void SendLandUpdateToClient(IClientAPI remote_client);
         void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
-- 
cgit v1.1


From b5d0bc24887e177e7b6e982789bfd86f27b84cf0 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Mar 2012 20:25:20 +0000
Subject: Rework Diva's patch to simplify it

---
 OpenSim/Framework/ILandObject.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Framework/ILandObject.cs')

diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index dd73b3f..4f98d7b 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -71,6 +71,7 @@ namespace OpenSim.Framework
         bool IsEitherBannedOrRestricted(UUID avatar);
         bool IsBannedFromLand(UUID avatar);
         bool IsRestrictedFromLand(UUID avatar);
+        bool IsInLandAccessList(UUID avatar);
         void SendLandUpdateToClient(IClientAPI remote_client);
         void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
         List<LandAccessEntry> CreateAccessListArrayByFlag(AccessList flag);
-- 
cgit v1.1