* Applied a patch that: Added estate ban table to migration scripts and nhibernate mapping. Refactored property getters and setters for estate ban object to support NHibernate.

* Added estate ban table to migration scripts of all supported databases.
* Added nhibernate mapping for EstateBans property of EstateSettings
* Refactored property accessors for EstateBan object.
* Added comments for EstateBan properties.
* Ensured that NHibernate tests pass with NUnitGUI.
* Ensured that nant test target passes.  

This fixes mantis #3210. Thank you, tlaukkan!

2 files changed, 83 insertions, 8 deletions

diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index 5c3aa42..64d32e8 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -31,10 +31,85 @@ namespace OpenSim.Framework
 {
     public class EstateBan
     {
-        public uint estateID = 1;
-        public UUID bannedUUID = UUID.Zero;
-        public string bannedIP = string.Empty;
-        public string bannedIPHostMask = string.Empty;
-        public string bannedNameMask = string.Empty;
+        private uint m_estateID = 1;
+        /// <summary>
+        /// ID of the estate this ban limits access to.
+        /// </summary>
+        public uint EstateID
+        {
+            get
+            {
+                return m_estateID; 
+            }
+            set
+            {
+                m_estateID = value;
+            }
+        }
+
+        private UUID m_bannedUserID = UUID.Zero;
+        /// <summary>
+        /// ID of the banned user.
+        /// </summary>
+        public UUID BannedUserID
+        {
+            get
+            {
+                return m_bannedUserID;
+            }
+            set
+            {
+                m_bannedUserID = value;
+            }
+        }
+
+        private string m_bannedHostAddress = string.Empty;
+        /// <summary>
+        /// IP address or domain name of the banned client.
+        /// </summary>
+        public string BannedHostAddress
+        {
+            get
+            {
+                return m_bannedHostAddress;
+            }
+            set
+            {
+                m_bannedHostAddress = value;
+            }
+        }
+
+        private string m_bannedHostIPMask = string.Empty;
+        /// <summary>
+        /// IP address mask for banning group of client hosts.
+        /// </summary>
+        public string BannedHostIPMask
+        {
+           get
+            {
+                return m_bannedHostIPMask;
+            }
+            set
+            {
+                m_bannedHostIPMask = value;
+            }
+        }
+
+        private string m_bannedHostNameMask = string.Empty;
+        /// <summary>
+        /// Domain name mask for banning group of client hosts.
+        /// </summary>
+        public string BannedHostNameMask
+        {
+            get
+            {
+                return m_bannedHostNameMask;
+            }
+            set
+            {
+                m_bannedHostNameMask = value;
+            }
+        }
+
     }
 }
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 81f85cd..b84d1d7 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Framework
         public bool IsBanned(UUID avatarID)
         {
             foreach (EstateBan ban in l_EstateBans)
-                if (ban.bannedUUID == avatarID)
+                if (ban.BannedUserID == avatarID)
                     return true;
             return false;
         }
@@ -342,7 +342,7 @@ namespace OpenSim.Framework
         {
             if (ban == null)
                 return;
-            if (!IsBanned(ban.bannedUUID))
+            if (!IsBanned(ban.BannedUserID))
                 l_EstateBans.Add(ban);
         }
 
@@ -354,7 +354,7 @@ namespace OpenSim.Framework
         public void RemoveBan(UUID avatarID)
         {
             foreach (EstateBan ban in new List<EstateBan>(l_EstateBans))
-                if (ban.bannedUUID == avatarID)
+                if (ban.BannedUserID == avatarID)
                     l_EstateBans.Remove(ban);
         }