From 1cadad9ec62c54fe8ebde8a895817bd980fed975 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sat, 21 Feb 2009 09:39:33 +0000
Subject: * 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!
---
OpenSim/Data/MySQL/MySQLEstateData.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Data/MySQL')
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 0db624d..133ee7a 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -314,9 +314,9 @@ namespace OpenSim.Data.MySQL
UUID uuid = new UUID();
UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
- eb.bannedUUID = uuid;
- eb.bannedIP = "0.0.0.0";
- eb.bannedIPHostMask = "0.0.0.0";
+ eb.BannedUserID = uuid;
+ eb.BannedHostAddress = "0.0.0.0";
+ eb.BannedHostIPMask = "0.0.0.0";
es.AddBan(eb);
}
r.Close();
@@ -340,7 +340,7 @@ namespace OpenSim.Data.MySQL
foreach (EstateBan b in es.EstateBans)
{
cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
- cmd.Parameters.AddWithValue("?bannedUUID", b.bannedUUID.ToString());
+ cmd.Parameters.AddWithValue("?bannedUUID", b.BannedUserID.ToString());
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();
--
cgit v1.1