Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/EstateSettings.cs

2 files changed, 13 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 32226f9..11a8883 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -435,6 +435,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int REGION_FLAG_ALLOW_DIRECT_TELEPORT = 0x100000;          // region allows direct teleports
         public const int REGION_FLAG_RESTRICT_PUSHOBJECT = 0x400000;            // region restricts llPushObject
 
+        //llManageEstateAccess
+        public const int ESTATE_ACCESS_ALLOWED_AGENT_ADD = 0;
+        public const int ESTATE_ACCESS_ALLOWED_AGENT_REMOVE = 1;
+        public const int ESTATE_ACCESS_ALLOWED_GROUP_ADD = 2;
+        public const int ESTATE_ACCESS_ALLOWED_GROUP_REMOVE = 3;
+        public const int ESTATE_ACCESS_BANNED_AGENT_ADD = 4;
+        public const int ESTATE_ACCESS_BANNED_AGENT_REMOVE = 5;
+
         public static readonly LSLInteger PAY_HIDE = new LSLInteger(-1);
         public static readonly LSLInteger PAY_DEFAULT = new LSLInteger(-2);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index e0c81c7..a27899f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1071,6 +1071,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llLoopSoundSlave(sound, volume);
         }
 
+        public LSL_Integer llManageEstateAccess(int action, string avatar)
+        {
+            return m_LSL_Functions.llManageEstateAccess(action, avatar);
+        }
+
         public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_LSL_Functions.llMakeExplosion(particles, scale, vel, lifetime, arc, texture, offset);