diff options
author | Justin Clark-Casey (justincc) | 2011-07-02 01:14:29 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-02 01:14:29 +0100 |
commit | b8e7258051abab3e1310dd8b08cb1d2e09fa21e3 (patch) | |
tree | a7e7958dfdb3a6adfb95726dcd57f64bb2262790 /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
parent | Add profile, merge, noassets and skip-assets options for loading/saving oars ... (diff) | |
download | opensim-SC_OLD-b8e7258051abab3e1310dd8b08cb1d2e09fa21e3.zip opensim-SC_OLD-b8e7258051abab3e1310dd8b08cb1d2e09fa21e3.tar.gz opensim-SC_OLD-b8e7258051abab3e1310dd8b08cb1d2e09fa21e3.tar.bz2 opensim-SC_OLD-b8e7258051abab3e1310dd8b08cb1d2e09fa21e3.tar.xz |
If a user has the rights to edit a parcel's properties, then also allow them always to enter that parcel.
This is patch http://opensimulator.org/mantis/view.php?id=5567
Thanks Snoopy!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 560b862..8c40171 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
418 | 418 | ||
419 | public bool IsBannedFromLand(UUID avatar) | 419 | public bool IsBannedFromLand(UUID avatar) |
420 | { | 420 | { |
421 | if (m_scene.Permissions.IsAdministrator(avatar)) | 421 | if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0)) |
422 | return false; | 422 | return false; |
423 | 423 | ||
424 | if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) | 424 | if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) |
@@ -429,7 +429,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
429 | if (e.AgentID == avatar && e.Flags == AccessList.Ban) | 429 | if (e.AgentID == avatar && e.Flags == AccessList.Ban) |
430 | return true; | 430 | return true; |
431 | return false; | 431 | return false; |
432 | }) != -1 && LandData.OwnerID != avatar) | 432 | }) != -1) |
433 | { | 433 | { |
434 | return true; | 434 | return true; |
435 | } | 435 | } |
@@ -439,7 +439,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
439 | 439 | ||
440 | public bool IsRestrictedFromLand(UUID avatar) | 440 | public bool IsRestrictedFromLand(UUID avatar) |
441 | { | 441 | { |
442 | if (m_scene.Permissions.IsAdministrator(avatar)) | 442 | if (m_scene.Permissions.CanEditParcelProperties(avatar, this, 0)) |
443 | return false; | 443 | return false; |
444 | 444 | ||
445 | if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) | 445 | if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) |
@@ -450,7 +450,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
450 | if (e.AgentID == avatar && e.Flags == AccessList.Access) | 450 | if (e.AgentID == avatar && e.Flags == AccessList.Access) |
451 | return true; | 451 | return true; |
452 | return false; | 452 | return false; |
453 | }) == -1 && LandData.OwnerID != avatar) | 453 | }) == -1) |
454 | { | 454 | { |
455 | return true; | 455 | return true; |
456 | } | 456 | } |