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/MSSQL | |
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 '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLEstateData.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
332 | // UUID uuid; | 332 | // UUID uuid; |
333 | // UUID.TryParse(reader["bannedUUID"].ToString(), out uuid); | 333 | // UUID.TryParse(reader["bannedUUID"].ToString(), out uuid); |
334 | 334 | ||
335 | eb.bannedUUID = new UUID((Guid)reader["bannedUUID"]); //uuid; | 335 | eb.BannedUserID = new UUID((Guid)reader["bannedUUID"]); //uuid; |
336 | eb.bannedIP = "0.0.0.0"; | 336 | eb.BannedHostAddress = "0.0.0.0"; |
337 | eb.bannedIPHostMask = "0.0.0.0"; | 337 | eb.BannedHostIPMask = "0.0.0.0"; |
338 | es.AddBan(eb); | 338 | es.AddBan(eb); |
339 | } | 339 | } |
340 | } | 340 | } |
@@ -386,7 +386,7 @@ namespace OpenSim.Data.MSSQL | |||
386 | { | 386 | { |
387 | cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID)); | 387 | cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID)); |
388 | 388 | ||
389 | cmd.Parameters.Add(_Database.CreateParameter("@bannedUUID", b.bannedUUID)); | 389 | cmd.Parameters.Add(_Database.CreateParameter("@bannedUUID", b.BannedUserID)); |
390 | 390 | ||
391 | cmd.ExecuteNonQuery(); | 391 | cmd.ExecuteNonQuery(); |
392 | 392 | ||