aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorlbsa712009-02-21 09:39:33 +0000
committerlbsa712009-02-21 09:39:33 +0000
commit1cadad9ec62c54fe8ebde8a895817bd980fed975 (patch)
tree00e9f96a1486fdb59a65494ef0bf88cbde082c2c /OpenSim/Data/MySQL
parentAdd copyright headers. Minor formatting cleanup. (diff)
downloadopensim-SC-1cadad9ec62c54fe8ebde8a895817bd980fed975.zip
opensim-SC-1cadad9ec62c54fe8ebde8a895817bd980fed975.tar.gz
opensim-SC-1cadad9ec62c54fe8ebde8a895817bd980fed975.tar.bz2
opensim-SC-1cadad9ec62c54fe8ebde8a895817bd980fed975.tar.xz
* 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!
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs8
1 files changed, 4 insertions, 4 deletions
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
314 UUID uuid = new UUID(); 314 UUID uuid = new UUID();
315 UUID.TryParse(r["bannedUUID"].ToString(), out uuid); 315 UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
316 316
317 eb.bannedUUID = uuid; 317 eb.BannedUserID = uuid;
318 eb.bannedIP = "0.0.0.0"; 318 eb.BannedHostAddress = "0.0.0.0";
319 eb.bannedIPHostMask = "0.0.0.0"; 319 eb.BannedHostIPMask = "0.0.0.0";
320 es.AddBan(eb); 320 es.AddBan(eb);
321 } 321 }
322 r.Close(); 322 r.Close();
@@ -340,7 +340,7 @@ namespace OpenSim.Data.MySQL
340 foreach (EstateBan b in es.EstateBans) 340 foreach (EstateBan b in es.EstateBans)
341 { 341 {
342 cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString()); 342 cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
343 cmd.Parameters.AddWithValue("?bannedUUID", b.bannedUUID.ToString()); 343 cmd.Parameters.AddWithValue("?bannedUUID", b.BannedUserID.ToString());
344 344
345 cmd.ExecuteNonQuery(); 345 cmd.ExecuteNonQuery();
346 cmd.Parameters.Clear(); 346 cmd.Parameters.Clear();