From 07bd749ac56dc498610fc88e61cc7ab04047620e Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 14 Jul 2008 01:39:36 +0000
Subject: 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 :(

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

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;
-- 
cgit v1.1