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/MSSQL/MSSQLEstateData.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Data/MSSQL') diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs index 4d5c116..3002fe3 100644 --- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs +++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs @@ -332,9 +332,9 @@ namespace OpenSim.Data.MSSQL // UUID uuid; // UUID.TryParse(reader["bannedUUID"].ToString(), out uuid); - eb.bannedUUID = new UUID((Guid)reader["bannedUUID"]); //uuid; - eb.bannedIP = "0.0.0.0"; - eb.bannedIPHostMask = "0.0.0.0"; + eb.BannedUserID = new UUID((Guid)reader["bannedUUID"]); //uuid; + eb.BannedHostAddress = "0.0.0.0"; + eb.BannedHostIPMask = "0.0.0.0"; es.AddBan(eb); } } @@ -386,7 +386,7 @@ namespace OpenSim.Data.MSSQL { cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID)); - cmd.Parameters.Add(_Database.CreateParameter("@bannedUUID", b.bannedUUID)); + cmd.Parameters.Add(_Database.CreateParameter("@bannedUUID", b.BannedUserID)); cmd.ExecuteNonQuery(); -- cgit v1.1