diff options
author | Melanie | 2012-02-05 20:12:35 +0000 |
---|---|---|
committer | Melanie | 2012-02-05 20:12:35 +0000 |
commit | 0904772a6f14e4f03d199d8def063d6fb16414eb (patch) | |
tree | fdfb9ef9a73f1f938d6ec71134ff56093d360217 /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |
parent | Make configuration uniform (diff) | |
download | opensim-SC_OLD-0904772a6f14e4f03d199d8def063d6fb16414eb.zip opensim-SC_OLD-0904772a6f14e4f03d199d8def063d6fb16414eb.tar.gz opensim-SC_OLD-0904772a6f14e4f03d199d8def063d6fb16414eb.tar.bz2 opensim-SC_OLD-0904772a6f14e4f03d199d8def063d6fb16414eb.tar.xz |
Revert "Check ban list for a particular parcel only when an avatar moves into it."
This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 00ac44d..1c503aa 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -389,8 +389,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
389 | { | 389 | { |
390 | if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT) | 390 | if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT) |
391 | { | 391 | { |
392 | ExpireAccessList(parcelAvatarIsEntering); | ||
393 | |||
394 | if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID)) | 392 | if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID)) |
395 | { | 393 | { |
396 | SendYouAreBannedNotice(avatar); | 394 | SendYouAreBannedNotice(avatar); |
@@ -1713,20 +1711,5 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1713 | 1711 | ||
1714 | MainConsole.Instance.Output(report.ToString()); | 1712 | MainConsole.Instance.Output(report.ToString()); |
1715 | } | 1713 | } |
1716 | |||
1717 | private void ExpireAccessList(ILandObject land) | ||
1718 | { | ||
1719 | List<LandAccessEntry> delete = new List<LandAccessEntry>(); | ||
1720 | |||
1721 | foreach (LandAccessEntry entry in land.LandData.ParcelAccessList) | ||
1722 | { | ||
1723 | if (entry.Expires != 0 && entry.Expires < Util.UnixTimeSinceEpoch()) | ||
1724 | delete.Add(entry); | ||
1725 | } | ||
1726 | foreach (LandAccessEntry entry in delete) | ||
1727 | land.LandData.ParcelAccessList.Remove(entry); | ||
1728 | |||
1729 | m_scene.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); | ||
1730 | } | ||
1731 | } | 1714 | } |
1732 | } | 1715 | } |