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 :(

1 files changed, 4 insertions, 4 deletions

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;