diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 9b2ddfd..16792b3 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 487 | if (m_scene.Permissions.IsAdministrator(avatar)) | 487 | if (m_scene.Permissions.IsAdministrator(avatar)) |
| 488 | return false; | 488 | return false; |
| 489 | 489 | ||
| 490 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | 490 | if (m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(avatar)) |
| 491 | return false; | 491 | return false; |
| 492 | 492 | ||
| 493 | if (avatar == LandData.OwnerID) | 493 | if (avatar == LandData.OwnerID) |
| @@ -517,7 +517,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 517 | if (m_scene.Permissions.IsAdministrator(avatar)) | 517 | if (m_scene.Permissions.IsAdministrator(avatar)) |
| 518 | return false; | 518 | return false; |
| 519 | 519 | ||
| 520 | if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) | 520 | if (m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(avatar)) |
| 521 | return false; | 521 | return false; |
| 522 | 522 | ||
| 523 | if (avatar == LandData.OwnerID) | 523 | if (avatar == LandData.OwnerID) |