Patch #9150

Patch 7 of the region patches. Finish off the region parts of the estate dialog. Full user functionality. Terrain textures, heights, water, avatar counts, prim bonus, debug settings and region toggles can now be set from the dialog on a per-region basis. Estate stuff defaults to sane values where there are no defaults, to estate_settings.xml otherwise. Sun still b0rked :(

8 files changed, 101 insertions, 32 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index e8a54bf..b170f28 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5884,21 +5884,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 }
 
                                 break;
-                            case "texturebase":
-                                if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId))
-                                {
-                                    foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
-                                    {
-                                        string s = Helpers.FieldToUTF8String(block.Parameter);
-                                        string[] splitField = s.Split(' ');
-                                        if (splitField.Length == 2)
-                                        {
-                                            LLUUID tempUUID = new LLUUID(splitField[1]);
-                                            OnSetEstateTerrainBaseTexture(this, Convert.ToInt16(splitField[0]), tempUUID);
-                                        }
-                                    }
-                                }
-                                break;
+//                            case "texturebase":
+//                                if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId))
+//                                {
+//                                    foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
+//                                    {
+//                                        string s = Helpers.FieldToUTF8String(block.Parameter);
+//                                        string[] splitField = s.Split(' ');
+//                                        if (splitField.Length == 2)
+//                                        {
+//                                            LLUUID tempUUID = new LLUUID(splitField[1]);
+//                                            OnSetEstateTerrainBaseTexture(this, Convert.ToInt16(splitField[0]), tempUUID);
+//                                        }
+//                                    }
+//                                }
+//                                break;
                             case "texturedetail":
                                 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId))
                                 {
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 782465e..fa7a2de 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -208,7 +208,7 @@ namespace OpenSim.Region.Communications.Local
                     map.X = (ushort) regInfo.RegionLocX;
                     map.Y = (ushort) regInfo.RegionLocY;
                     map.WaterHeight = (byte) regInfo.RegionSettings.WaterHeight;
-                    map.MapImageId = regInfo.EstateSettings.terrainImageID;
+                    map.MapImageId = regInfo.RegionSettings.TerrainImageID;
                     map.Agents = 1;
                     map.RegionFlags = 72458694;
                     map.Access = 13;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 2192d12..6f4a563 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Communications.OGS1
             GridParams["sim_name"] = regionInfo.RegionName;
             GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
             GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString();
-            GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString();
+            GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString();
             GridParams["originUUID"] = regionInfo.originRegionID.ToString();
             GridParams["server_uri"] = regionInfo.ServerURI;
             GridParams["region_secret"] = regionInfo.regionSecret;
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 55896d4..ac6a075 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -118,6 +118,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
                     m_scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
                     break;
             }
+            m_scene.RegionInfo.RegionSettings.Save();
         }
 
         public void setEstateTerrainTextureHeights(IClientAPI client, int corner, float lowValue, float highValue)
@@ -141,6 +142,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
                     m_scene.RegionInfo.RegionSettings.Elevation2NE = highValue;
                     break;
             }
+            m_scene.RegionInfo.RegionSettings.Save();
         }
 
         private void handleCommitEstateTerrainTextureRequest(IClientAPI remoteClient)
@@ -160,10 +162,13 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
 
             // Time of day / fixed sun
             m_scene.RegionInfo.RegionSettings.FixedSun = UseFixedSun;
-            m_scene.RegionInfo.EstateSettings.sunHour = SunHour;
+            m_scene.RegionInfo.RegionSettings.SunPosition = SunHour;
+
             m_scene.EventManager.TriggerEstateToolsTimeUpdate(m_scene.RegionInfo.RegionHandle, UseFixedSun, UseFixedSun, SunHour);
+
             //m_log.Debug("[ESTATE]: UFS: " + UseFixedSun.ToString());
             //m_log.Debug("[ESTATE]: SunHour: " + SunHour.ToString());
+
             sendRegionInfoPacketToAll();
             m_scene.RegionInfo.RegionSettings.Save();
         }
@@ -368,7 +373,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
            args.simAccess = mature;
 
            if (m_scene.RegionInfo.RegionSettings.FixedSun)
-               args.sunHour = m_scene.RegionInfo.EstateSettings.sunHour;
+               args.sunHour = (float)m_scene.RegionInfo.RegionSettings.SunPosition;
            else
                args.sunHour = m_scene.EventManager.GetSunLindenHour();
            
@@ -586,8 +591,12 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
 
         public void changeWaterHeight(float height)
         {
-            setRegionTerrainSettings(height, (float)m_scene.RegionInfo.RegionSettings.TerrainRaiseLimit, (float)m_scene.RegionInfo.RegionSettings.TerrainLowerLimit,
-                                     m_scene.RegionInfo.RegionSettings.FixedSun, m_scene.RegionInfo.EstateSettings.sunHour);
+            setRegionTerrainSettings(height,
+                    (float)m_scene.RegionInfo.RegionSettings.TerrainRaiseLimit,
+                    (float)m_scene.RegionInfo.RegionSettings.TerrainLowerLimit,
+                    m_scene.RegionInfo.RegionSettings.FixedSun,
+                    (float)m_scene.RegionInfo.RegionSettings.SunPosition);
+
             sendRegionInfoPacketToAll();
         }
 
@@ -597,7 +606,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
         {
             client.OnDetailedEstateDataRequest += sendDetailedEstateData;
             client.OnSetEstateFlagsRequest += estateSetRegionInfoHandler;
-            client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture;
+//            client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture;
+            client.OnSetEstateTerrainDetailTexture += setEstateTerrainBaseTexture;
             client.OnSetEstateTerrainTextureHeights += setEstateTerrainTextureHeights;
             client.OnCommitEstateTerrainTextureRequest += handleCommitEstateTerrainTextureRequest;
             client.OnSetRegionTerrainSettings += setRegionTerrainSettings;
@@ -618,7 +628,66 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
         public uint GetRegionFlags()
         {
             Simulator.RegionFlags flags = Simulator.RegionFlags.None;
-            //m_scene.RegionInfo.RegionSettings.
+            
+            // Fully implemented
+            //
+            if(m_scene.RegionInfo.RegionSettings.AllowDamage)
+                flags |= Simulator.RegionFlags.AllowDamage;
+            if(m_scene.RegionInfo.RegionSettings.BlockTerraform)
+                flags |= Simulator.RegionFlags.BlockTerraform;
+            if(!m_scene.RegionInfo.RegionSettings.AllowLandResell)
+                flags |= Simulator.RegionFlags.BlockLandResell;
+            if(m_scene.RegionInfo.RegionSettings.DisableCollisions)
+                flags |= Simulator.RegionFlags.SkipCollisions;
+            if(m_scene.RegionInfo.RegionSettings.DisableScripts)
+                flags |= Simulator.RegionFlags.SkipScripts;
+            if(m_scene.RegionInfo.RegionSettings.DisablePhysics)
+                flags |= Simulator.RegionFlags.SkipPhysics;
+            if(m_scene.RegionInfo.RegionSettings.BlockFly)
+                flags |= Simulator.RegionFlags.NoFly;
+            if(m_scene.RegionInfo.RegionSettings.RestrictPushing)
+                flags |= Simulator.RegionFlags.RestrictPushObject;
+            if(m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
+                flags |= Simulator.RegionFlags.AllowParcelChanges;
+            if(m_scene.RegionInfo.RegionSettings.BlockShowInSearch)
+                flags |= (Simulator.RegionFlags)(1 << 29);
+
+            // Partially implemented
+            //
+            if(m_scene.RegionInfo.RegionSettings.FixedSun)
+                flags |= Simulator.RegionFlags.SunFixed;
+
+            // Not implemented
+            //
+            // TODO: ExternallyVisible
+            flags |= Simulator.RegionFlags.ExternallyVisible;
+            // TODO: PublicAllowed
+            flags |= Simulator.RegionFlags.PublicAllowed;
+            // TODO: AllowDirectTeleport
+            flags |= Simulator.RegionFlags.AllowDirectTeleport;
+            // TODO: AllowVoice
+            flags |= Simulator.RegionFlags.AllowVoice;
+
+            // TDOD: AllowLandmark
+            // TDOD: AllowSetHome
+            // TODO: ResetHomeOnTeleport
+            // TODO: TaxFree ? (Linden-ism)
+            // TODO: Sandbox ?
+            // TODO: SkipUpdateInterestList
+            // TODO: ExternallyVisible
+            // TODO: DenyAnonymous
+            // TODO: DenyIdentified
+            // TODO: DenyTransacted
+            // TODO: AbuseEmailToEstateOwner
+            // TODO: BlockDwell
+            // TODO: EstateSkipScripts
+
+            // Omitted
+            //
+            // Omitted: NullLayer (what is that?)
+            // Omitted: SkipAgentAction (what does it do?)
+            // Omitted: MainlandVisible (Do we need it)
+
             return (uint)flags;
         }
     }
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index f73c193..5682de3 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -301,7 +301,7 @@ namespace OpenSim.Region.Environment.Modules
             }
 
             // set estate settings for region access to sun position
-            m_scene.RegionInfo.EstateSettings.sunPosition = Position;
+            m_scene.RegionInfo.RegionSettings.SunVector = Position;
             //m_scene.RegionInfo.EstateSettings.sunHour = GetLindenEstateHourFromCurrentTime();
         }
         public void ForceSunUpdateToAllClients()
@@ -316,8 +316,8 @@ namespace OpenSim.Region.Environment.Modules
             }
 
             // set estate settings for region access to sun position
-            m_scene.RegionInfo.EstateSettings.sunPosition = Position;
-            m_scene.RegionInfo.EstateSettings.sunHour = GetLindenEstateHourFromCurrentTime();
+            m_scene.RegionInfo.RegionSettings.SunVector = Position;
+            m_scene.RegionInfo.RegionSettings.SunPosition = GetLindenEstateHourFromCurrentTime();
         }
         /// <summary>
         /// Calculate the sun's orbital position and its velocity.
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 36a0ffc..a6a5264 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1354,10 +1354,10 @@ namespace OpenSim.Region.Environment.Scenes
                     m_log.Warn("[MAPTILE]: REUSING OLD MAPTILE IMAGE ID");
                 }
 
-                m_regInfo.EstateSettings.terrainImageID = TerrainImageLLUUID;
+                m_regInfo.RegionSettings.TerrainImageID = TerrainImageLLUUID;
 
                 AssetBase asset = new AssetBase();
-                asset.FullID = m_regInfo.EstateSettings.terrainImageID;
+                asset.FullID = m_regInfo.RegionSettings.TerrainImageID;
                 asset.Data = data;
                 asset.Name = "terrainImage_" + m_regInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString();
                 asset.Description = RegionInfo.RegionName;
@@ -1405,10 +1405,10 @@ namespace OpenSim.Region.Environment.Scenes
                         TerrainImageLLUUID = lastMapRegionUUID;
                     }
 
-                    m_regInfo.EstateSettings.terrainImageID = TerrainImageLLUUID;
+                    m_regInfo.RegionSettings.TerrainImageID = TerrainImageLLUUID;
 
                     AssetBase asset = new AssetBase();
-                    asset.FullID = m_regInfo.EstateSettings.terrainImageID;
+                    asset.FullID = m_regInfo.RegionSettings.TerrainImageID;
                     asset.Data = data;
                     asset.Name = "terrainImage_" + m_regInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString();
                     asset.Description = RegionInfo.RegionName;
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 0d3049d..4106fbb 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3274,7 +3274,7 @@ namespace OpenSim.Region.ScriptEngine.Common
 
             // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule
             // have to convert from LLVector3 (float) to LSL_Types.Vector3 (double)
-            SunFloatVector3 = World.RegionInfo.EstateSettings.sunPosition;
+            SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector;
             SunDoubleVector3.x = (double)SunFloatVector3.X;
             SunDoubleVector3.y = (double)SunFloatVector3.Y;
             SunDoubleVector3.z = (double)SunFloatVector3.Z;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 30a64c7..06a6086 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3214,7 +3214,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule
             // have to convert from LLVector3 (float) to LSL_Types.Vector3 (double)
-            SunFloatVector3 = World.RegionInfo.EstateSettings.sunPosition;
+            SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector;
             SunDoubleVector3.x = (double)SunFloatVector3.X;
             SunDoubleVector3.y = (double)SunFloatVector3.Y;
             SunDoubleVector3.z = (double)SunFloatVector3.Z;