diff options
author | lbsa71 | 2009-02-21 09:39:33 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-21 09:39:33 +0000 |
commit | 1cadad9ec62c54fe8ebde8a895817bd980fed975 (patch) | |
tree | 00e9f96a1486fdb59a65494ef0bf88cbde082c2c /OpenSim/Data/SQLite | |
parent | Add copyright headers. Minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-1cadad9ec62c54fe8ebde8a895817bd980fed975.zip opensim-SC_OLD-1cadad9ec62c54fe8ebde8a895817bd980fed975.tar.gz opensim-SC_OLD-1cadad9ec62c54fe8ebde8a895817bd980fed975.tar.bz2 opensim-SC_OLD-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/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteEstateData.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs index 3fb33c2..dea5624 100644 --- a/OpenSim/Data/SQLite/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs | |||
@@ -258,9 +258,9 @@ namespace OpenSim.Data.SQLite | |||
258 | UUID uuid = new UUID(); | 258 | UUID uuid = new UUID(); |
259 | UUID.TryParse(r["bannedUUID"].ToString(), out uuid); | 259 | UUID.TryParse(r["bannedUUID"].ToString(), out uuid); |
260 | 260 | ||
261 | eb.bannedUUID = uuid; | 261 | eb.BannedUserID = uuid; |
262 | eb.bannedIP = "0.0.0.0"; | 262 | eb.BannedHostAddress = "0.0.0.0"; |
263 | eb.bannedIPHostMask = "0.0.0.0"; | 263 | eb.BannedHostIPMask = "0.0.0.0"; |
264 | es.AddBan(eb); | 264 | es.AddBan(eb); |
265 | } | 265 | } |
266 | r.Close(); | 266 | r.Close(); |
@@ -282,7 +282,7 @@ namespace OpenSim.Data.SQLite | |||
282 | foreach (EstateBan b in es.EstateBans) | 282 | foreach (EstateBan b in es.EstateBans) |
283 | { | 283 | { |
284 | cmd.Parameters.Add(":EstateID", es.EstateID.ToString()); | 284 | cmd.Parameters.Add(":EstateID", es.EstateID.ToString()); |
285 | cmd.Parameters.Add(":bannedUUID", b.bannedUUID.ToString()); | 285 | cmd.Parameters.Add(":bannedUUID", b.BannedUserID.ToString()); |
286 | 286 | ||
287 | cmd.ExecuteNonQuery(); | 287 | cmd.ExecuteNonQuery(); |
288 | cmd.Parameters.Clear(); | 288 | cmd.Parameters.Clear(); |