aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3a066d4..5b1b165 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1576,8 +1576,15 @@ namespace OpenSim.Region.Framework.Scenes
1576 double[,] map = SimulationDataService.LoadTerrain(RegionInfo.RegionID); 1576 double[,] map = SimulationDataService.LoadTerrain(RegionInfo.RegionID);
1577 if (map == null) 1577 if (map == null)
1578 { 1578 {
1579 m_log.Info("[TERRAIN]: No default terrain. Generating a new terrain."); 1579 // This should be in the Terrain module, but it isn't because
1580 Heightmap = new TerrainChannel(); 1580 // the heightmap is needed _way_ before the modules are initialized...
1581 IConfig terrainConfig = m_config.Configs["Terrain"];
1582 String m_InitialTerrain = "pinhead-island";
1583 if (terrainConfig != null)
1584 m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain);
1585
1586 m_log.InfoFormat("[TERRAIN]: No default terrain. Generating a new terrain {0}.", m_InitialTerrain);
1587 Heightmap = new TerrainChannel(m_InitialTerrain);
1581 1588
1582 SimulationDataService.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); 1589 SimulationDataService.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
1583 } 1590 }