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/Region/CoreModules/World/Estate | |
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/Region/CoreModules/World/Estate/EstateManagementModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index b567047..7a200d4 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
241 | 241 | ||
242 | for (int i = 0; i < banlistcheck.Length; i++) | 242 | for (int i = 0; i < banlistcheck.Length; i++) |
243 | { | 243 | { |
244 | if (user == banlistcheck[i].bannedUUID) | 244 | if (user == banlistcheck[i].BannedUserID) |
245 | { | 245 | { |
246 | alreadyInList = true; | 246 | alreadyInList = true; |
247 | break; | 247 | break; |
@@ -253,10 +253,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
253 | 253 | ||
254 | EstateBan item = new EstateBan(); | 254 | EstateBan item = new EstateBan(); |
255 | 255 | ||
256 | item.bannedUUID = user; | 256 | item.BannedUserID = user; |
257 | item.estateID = m_scene.RegionInfo.EstateSettings.EstateID; | 257 | item.EstateID = m_scene.RegionInfo.EstateSettings.EstateID; |
258 | item.bannedIP = "0.0.0.0"; | 258 | item.BannedHostAddress = "0.0.0.0"; |
259 | item.bannedIPHostMask = "0.0.0.0"; | 259 | item.BannedHostIPMask = "0.0.0.0"; |
260 | 260 | ||
261 | m_scene.RegionInfo.EstateSettings.AddBan(item); | 261 | m_scene.RegionInfo.EstateSettings.AddBan(item); |
262 | m_scene.RegionInfo.EstateSettings.Save(); | 262 | m_scene.RegionInfo.EstateSettings.Save(); |
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
294 | 294 | ||
295 | for (int i = 0; i < banlistcheck.Length; i++) | 295 | for (int i = 0; i < banlistcheck.Length; i++) |
296 | { | 296 | { |
297 | if (user == banlistcheck[i].bannedUUID) | 297 | if (user == banlistcheck[i].BannedUserID) |
298 | { | 298 | { |
299 | alreadyInList = true; | 299 | alreadyInList = true; |
300 | listitem = banlistcheck[i]; | 300 | listitem = banlistcheck[i]; |
@@ -304,7 +304,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
304 | } | 304 | } |
305 | if (alreadyInList && listitem != null) | 305 | if (alreadyInList && listitem != null) |
306 | { | 306 | { |
307 | m_scene.RegionInfo.EstateSettings.RemoveBan(listitem.bannedUUID); | 307 | m_scene.RegionInfo.EstateSettings.RemoveBan(listitem.BannedUserID); |
308 | m_scene.RegionInfo.EstateSettings.Save(); | 308 | m_scene.RegionInfo.EstateSettings.Save(); |
309 | } | 309 | } |
310 | else | 310 | else |