aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/EstateSettings.cs
diff options
context:
space:
mode:
authorlbsa712009-02-21 09:39:33 +0000
committerlbsa712009-02-21 09:39:33 +0000
commit1cadad9ec62c54fe8ebde8a895817bd980fed975 (patch)
tree00e9f96a1486fdb59a65494ef0bf88cbde082c2c /OpenSim/Framework/EstateSettings.cs
parentAdd copyright headers. Minor formatting cleanup. (diff)
downloadopensim-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/Framework/EstateSettings.cs')
-rw-r--r--OpenSim/Framework/EstateSettings.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 81f85cd..b84d1d7 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Framework
333 public bool IsBanned(UUID avatarID) 333 public bool IsBanned(UUID avatarID)
334 { 334 {
335 foreach (EstateBan ban in l_EstateBans) 335 foreach (EstateBan ban in l_EstateBans)
336 if (ban.bannedUUID == avatarID) 336 if (ban.BannedUserID == avatarID)
337 return true; 337 return true;
338 return false; 338 return false;
339 } 339 }
@@ -342,7 +342,7 @@ namespace OpenSim.Framework
342 { 342 {
343 if (ban == null) 343 if (ban == null)
344 return; 344 return;
345 if (!IsBanned(ban.bannedUUID)) 345 if (!IsBanned(ban.BannedUserID))
346 l_EstateBans.Add(ban); 346 l_EstateBans.Add(ban);
347 } 347 }
348 348
@@ -354,7 +354,7 @@ namespace OpenSim.Framework
354 public void RemoveBan(UUID avatarID) 354 public void RemoveBan(UUID avatarID)
355 { 355 {
356 foreach (EstateBan ban in new List<EstateBan>(l_EstateBans)) 356 foreach (EstateBan ban in new List<EstateBan>(l_EstateBans))
357 if (ban.bannedUUID == avatarID) 357 if (ban.BannedUserID == avatarID)
358 l_EstateBans.Remove(ban); 358 l_EstateBans.Remove(ban);
359 } 359 }
360 360