1 files changed, 96 insertions, 13 deletions

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 4df7860..8c8270a 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -305,11 +305,17 @@ namespace OpenSim.Framework
                 OnSave(this);
         }
 
+        public int EstateUsersCount()
+        {
+            return l_EstateAccess.Count;
+        }
+
         public void AddEstateUser(UUID avatarID)
         {
             if (avatarID == UUID.Zero)
                 return;
-            if (!l_EstateAccess.Contains(avatarID))
+            if (!l_EstateAccess.Contains(avatarID) &&
+                    (l_EstateAccess.Count < (int)Constants.EstateAccessLimits.AllowedAccess))
                 l_EstateAccess.Add(avatarID);
         }
 
@@ -319,11 +325,17 @@ namespace OpenSim.Framework
                 l_EstateAccess.Remove(avatarID);
         }
 
+        public int EstateGroupsCount()
+        {
+            return l_EstateGroups.Count;
+        }
+
         public void AddEstateGroup(UUID avatarID)
         {
             if (avatarID == UUID.Zero)
                 return;
-            if (!l_EstateGroups.Contains(avatarID))
+            if (!l_EstateGroups.Contains(avatarID) &&
+                    (l_EstateGroups.Count < (int)Constants.EstateAccessLimits.AllowedGroups))
                 l_EstateGroups.Add(avatarID);
         }
 
@@ -333,11 +345,17 @@ namespace OpenSim.Framework
                 l_EstateGroups.Remove(avatarID);
         }
 
+        public int EstateManagersCount()
+        {
+            return l_EstateManagers.Count;
+        }
+
         public void AddEstateManager(UUID avatarID)
         {
             if (avatarID == UUID.Zero)
                 return;
-            if (!l_EstateManagers.Contains(avatarID))
+            if (!l_EstateManagers.Contains(avatarID) &&
+                (l_EstateManagers.Count < (int)Constants.EstateAccessLimits.EstateManagers))
                 l_EstateManagers.Add(avatarID);
         }
 
@@ -365,17 +383,55 @@ namespace OpenSim.Framework
 
         public bool IsBanned(UUID avatarID)
         {
-            foreach (EstateBan ban in l_EstateBans)
+            if (!IsEstateManagerOrOwner(avatarID))
+            {
+                foreach (EstateBan ban in l_EstateBans)
+                    if (ban.BannedUserID == avatarID)
+                        return true;
+            }
+            return false;
+        }
+
+        public bool IsBanned(UUID avatarID, int userFlags)
+        {
+            if (!IsEstateManagerOrOwner(avatarID))
+            {
+                foreach (EstateBan ban in l_EstateBans)
                 if (ban.BannedUserID == avatarID)
                     return true;
+
+                if (!HasAccess(avatarID))
+                {
+                    if (DenyMinors)
+                    {
+                        if ((userFlags & 32) == 0)
+                        {
+                            return true;
+                        }
+                    }
+                    if (DenyAnonymous)
+                    {
+                        if ((userFlags & 4) == 0)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
             return false;
         }
 
+        public int EstateBansCount()
+        {
+            return l_EstateBans.Count;
+        }
+
         public void AddBan(EstateBan ban)
         {
             if (ban == null)
                 return;
-            if (!IsBanned(ban.BannedUserID))
+            if (!IsBanned(ban.BannedUserID, 32) &&
+                (l_EstateBans.Count < (int)Constants.EstateAccessLimits.EstateBans)) //Ignore age-based bans
                 l_EstateBans.Add(ban);
         }
 
@@ -516,14 +572,41 @@ namespace OpenSim.Framework
 
             // EstateBans are special
             if (map.ContainsKey("EstateBans"))
-            {
-                var banData = ((Dictionary<string, object>)map["EstateBans"]).Values;
-                EstateBan[] bans = new EstateBan[banData.Count];
-                int b = 0;
-                foreach (Dictionary<string, object> ban in banData)
-                    bans[b++] = new EstateBan(ban);
-                PropertyInfo bansProperty = this.GetType().GetProperty("EstateBans", BindingFlags.Public | BindingFlags.Instance);
-                bansProperty.SetValue(this, bans, null);
+            {               
+                if(map["EstateBans"] is string)
+                {
+                    // JSON encoded bans map
+                    Dictionary<string, EstateBan> bdata = new Dictionary<string, EstateBan>();
+                    try
+                    {
+                        // bypass libovm, we dont need even more useless high level maps
+                        // this should only be called once.. but no problem, i hope
+                        // (other uses may need more..)
+                        LitJson.JsonMapper.RegisterImporter<string, UUID>((input) => new UUID(input));
+                        bdata = LitJson.JsonMapper.ToObject<Dictionary<string,EstateBan>>((string)map["EstateBans"]);
+                    }
+ //                   catch(Exception e)
+                    catch
+                    {
+                        return;
+                    }
+                    EstateBan[] jbans = new EstateBan[bdata.Count];
+                    bdata.Values.CopyTo(jbans,0);
+
+                    PropertyInfo jbansProperty = this.GetType().GetProperty("EstateBans", BindingFlags.Public | BindingFlags.Instance);
+                    jbansProperty.SetValue(this, jbans, null);
+                }
+                else
+                {
+                    var banData = ((Dictionary<string, object>)map["EstateBans"]).Values;
+                    EstateBan[] bans = new EstateBan[banData.Count];
+
+                    int b = 0;
+                    foreach (Dictionary<string, object> ban in banData)
+                        bans[b++] = new EstateBan(ban);
+                    PropertyInfo bansProperty = this.GetType().GetProperty("EstateBans", BindingFlags.Public | BindingFlags.Instance);
+                    bansProperty.SetValue(this, bans, null);
+                 }
             }
         }
     }