aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index d4f53ff..7945815 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -709,15 +709,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
709 public void sendRegionHandshake(IClientAPI remoteClient) 709 public void sendRegionHandshake(IClientAPI remoteClient)
710 { 710 {
711 RegionHandshakeArgs args = new RegionHandshakeArgs(); 711 RegionHandshakeArgs args = new RegionHandshakeArgs();
712 bool estatemanager = false;
713 UUID[] EstateManagers = m_scene.RegionInfo.EstateSettings.EstateManagers;
714 for (int i = 0; i < EstateManagers.Length; i++)
715 {
716 if (EstateManagers[i] == remoteClient.AgentId)
717 estatemanager = true;
718 }
719 712
720 args.isEstateManager = estatemanager; 713 args.isEstateManager = m_scene.RegionInfo.EstateSettings.IsEstateManager(remoteClient.AgentId);
714 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero && m_scene.RegionInfo.EstateSettings.EstateOwner == remoteClient.AgentId)
715 args.isEstateManager = true;
721 716
722 args.billableFactor = m_scene.RegionInfo.EstateSettings.BillableFactor; 717 args.billableFactor = m_scene.RegionInfo.EstateSettings.BillableFactor;
723 args.terrainStartHeight0 = (float)m_scene.RegionInfo.RegionSettings.Elevation1SW; 718 args.terrainStartHeight0 = (float)m_scene.RegionInfo.RegionSettings.Elevation1SW;