* 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, 9 insertions, 9 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 34ad0f1..c715949 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2992,9 +2992,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 if (bl[i] == null)
                     continue;
-                if (bl[i].bannedUUID == UUID.Zero)
+                if (bl[i].BannedUserID == UUID.Zero)
                     continue;
-                BannedUsers.Add(bl[i].bannedUUID);
+                BannedUsers.Add(bl[i].BannedUserID);
             }
 
             EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index b567047..7a200d4 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
                         for (int i = 0; i < banlistcheck.Length; i++)
                         {
-                            if (user == banlistcheck[i].bannedUUID)
+                            if (user == banlistcheck[i].BannedUserID)
                             {
                                 alreadyInList = true;
                                 break;
@@ -253,10 +253,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
                             EstateBan item = new EstateBan();
 
-                            item.bannedUUID = user;
-                            item.estateID = m_scene.RegionInfo.EstateSettings.EstateID;
-                            item.bannedIP = "0.0.0.0";
-                            item.bannedIPHostMask = "0.0.0.0";
+                            item.BannedUserID = user;
+                            item.EstateID = m_scene.RegionInfo.EstateSettings.EstateID;
+                            item.BannedHostAddress = "0.0.0.0";
+                            item.BannedHostIPMask = "0.0.0.0";
 
                             m_scene.RegionInfo.EstateSettings.AddBan(item);
                             m_scene.RegionInfo.EstateSettings.Save();
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
                         for (int i = 0; i < banlistcheck.Length; i++)
                         {
-                            if (user == banlistcheck[i].bannedUUID)
+                            if (user == banlistcheck[i].BannedUserID)
                             {
                                 alreadyInList = true;
                                 listitem = banlistcheck[i];
@@ -304,7 +304,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         }
                         if (alreadyInList && listitem != null)
                         {
-                            m_scene.RegionInfo.EstateSettings.RemoveBan(listitem.bannedUUID);
+                            m_scene.RegionInfo.EstateSettings.RemoveBan(listitem.BannedUserID);
                             m_scene.RegionInfo.EstateSettings.Save();
                         }
                         else