From 7211afb3b9193e23ee19225bd2f7ebfe8249bdd2 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 20 Mar 2019 15:12:56 +0000 Subject: missing file --- .../World/Estate/EstateManagementModule.cs | 86 +++++++--------------- 1 file changed, 27 insertions(+), 59 deletions(-) (limited to 'OpenSim/Region/CoreModules/World') diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index ac28cee..fd08721 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs @@ -1518,42 +1518,7 @@ namespace OpenSim.Region.CoreModules.World.Estate public void sendRegionHandshake(IClientAPI remoteClient) { - RegionHandshakeArgs args = new RegionHandshakeArgs(); - - args.isEstateManager = Scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(remoteClient.AgentId); - if (Scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero && Scene.RegionInfo.EstateSettings.EstateOwner == remoteClient.AgentId) - args.isEstateManager = true; - - args.billableFactor = Scene.RegionInfo.EstateSettings.BillableFactor; - args.terrainStartHeight0 = (float)Scene.RegionInfo.RegionSettings.Elevation1SW; - args.terrainHeightRange0 = (float)Scene.RegionInfo.RegionSettings.Elevation2SW; - args.terrainStartHeight1 = (float)Scene.RegionInfo.RegionSettings.Elevation1NW; - args.terrainHeightRange1 = (float)Scene.RegionInfo.RegionSettings.Elevation2NW; - args.terrainStartHeight2 = (float)Scene.RegionInfo.RegionSettings.Elevation1SE; - args.terrainHeightRange2 = (float)Scene.RegionInfo.RegionSettings.Elevation2SE; - args.terrainStartHeight3 = (float)Scene.RegionInfo.RegionSettings.Elevation1NE; - args.terrainHeightRange3 = (float)Scene.RegionInfo.RegionSettings.Elevation2NE; - args.simAccess = Scene.RegionInfo.AccessLevel; - args.waterHeight = (float)Scene.RegionInfo.RegionSettings.WaterHeight; - args.regionFlags = GetRegionFlags(); - args.regionName = Scene.RegionInfo.RegionName; - args.SimOwner = Scene.RegionInfo.EstateSettings.EstateOwner; - - args.terrainBase0 = UUID.Zero; - args.terrainBase1 = UUID.Zero; - args.terrainBase2 = UUID.Zero; - args.terrainBase3 = UUID.Zero; - args.terrainDetail0 = Scene.RegionInfo.RegionSettings.TerrainTexture1; - args.terrainDetail1 = Scene.RegionInfo.RegionSettings.TerrainTexture2; - args.terrainDetail2 = Scene.RegionInfo.RegionSettings.TerrainTexture3; - args.terrainDetail3 = Scene.RegionInfo.RegionSettings.TerrainTexture4; - -// m_log.DebugFormat("[ESTATE MANAGEMENT MODULE]: Sending terrain texture 1 {0} for region {1}", args.terrainDetail0, Scene.RegionInfo.RegionName); -// m_log.DebugFormat("[ESTATE MANAGEMENT MODULE]: Sending terrain texture 2 {0} for region {1}", args.terrainDetail1, Scene.RegionInfo.RegionName); -// m_log.DebugFormat("[ESTATE MANAGEMENT MODULE]: Sending terrain texture 3 {0} for region {1}", args.terrainDetail2, Scene.RegionInfo.RegionName); -// m_log.DebugFormat("[ESTATE MANAGEMENT MODULE]: Sending terrain texture 4 {0} for region {1}", args.terrainDetail3, Scene.RegionInfo.RegionName); - - remoteClient.SendRegionHandshake(Scene.RegionInfo,args); + remoteClient.SendRegionHandshake(); } public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2) @@ -1673,7 +1638,6 @@ namespace OpenSim.Region.CoreModules.World.Estate client.OnRegionInfoRequest += HandleRegionInfoRequest; client.OnEstateCovenantRequest += HandleEstateCovenantRequest; client.OnLandStatRequest += HandleLandStatRequest; - sendRegionHandshake(client); } @@ -1681,39 +1645,43 @@ namespace OpenSim.Region.CoreModules.World.Estate { RegionFlags flags = RegionFlags.None; + if (Scene.RegionInfo.EstateSettings.AllowLandmark) + flags |= RegionFlags.AllowLandmark; + if (Scene.RegionInfo.EstateSettings.AllowSetHome) + flags |= RegionFlags.AllowSetHome; + if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) + flags |= RegionFlags.ResetHomeOnTeleport; if (Scene.RegionInfo.EstateSettings.FixedSun) flags |= RegionFlags.SunFixed; - if (Scene.RegionInfo.EstateSettings.PublicAccess) - flags |= (RegionFlags.PublicAllowed | - RegionFlags.ExternallyVisible); - if (Scene.RegionInfo.EstateSettings.AllowVoice) - flags |= RegionFlags.AllowVoice; + if (Scene.RegionInfo.EstateSettings.TaxFree) // this is now wrong means ALLOW_ACCESS_OVERRIDE + flags |= RegionFlags.TaxFree; + + if (Scene.RegionInfo.EstateSettings.PublicAccess) //?? + flags |= (RegionFlags.PublicAllowed | RegionFlags.ExternallyVisible); + + if (Scene.RegionInfo.EstateSettings.BlockDwell) + flags |= RegionFlags.BlockDwell; if (Scene.RegionInfo.EstateSettings.AllowDirectTeleport) flags |= RegionFlags.AllowDirectTeleport; + if (Scene.RegionInfo.EstateSettings.EstateSkipScripts) + flags |= RegionFlags.EstateSkipScripts; + if (Scene.RegionInfo.EstateSettings.DenyAnonymous) flags |= RegionFlags.DenyAnonymous; - if (Scene.RegionInfo.EstateSettings.DenyIdentified) + if (Scene.RegionInfo.EstateSettings.DenyIdentified) // unused? flags |= RegionFlags.DenyIdentified; - if (Scene.RegionInfo.EstateSettings.DenyTransacted) + if (Scene.RegionInfo.EstateSettings.DenyTransacted) // unused? flags |= RegionFlags.DenyTransacted; - if (Scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner) - flags |= RegionFlags.AbuseEmailToEstateOwner; - if (Scene.RegionInfo.EstateSettings.BlockDwell) - flags |= RegionFlags.BlockDwell; - if (Scene.RegionInfo.EstateSettings.EstateSkipScripts) - flags |= RegionFlags.EstateSkipScripts; - if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) - flags |= RegionFlags.ResetHomeOnTeleport; - if (Scene.RegionInfo.EstateSettings.TaxFree) - flags |= RegionFlags.TaxFree; - if (Scene.RegionInfo.EstateSettings.AllowLandmark) - flags |= RegionFlags.AllowLandmark; if (Scene.RegionInfo.EstateSettings.AllowParcelChanges) flags |= RegionFlags.AllowParcelChanges; - if (Scene.RegionInfo.EstateSettings.AllowSetHome) - flags |= RegionFlags.AllowSetHome; + if (Scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner) // now is block fly + flags |= RegionFlags.AbuseEmailToEstateOwner; + if (Scene.RegionInfo.EstateSettings.AllowVoice) + flags |= RegionFlags.AllowVoice; + + if (Scene.RegionInfo.EstateSettings.DenyMinors) - flags |= (RegionFlags)(1 << 30); + flags |= RegionFlags.DenyAgeUnverified; return (uint)flags; } -- cgit v1.1