From 99a308007c6c13dc13a2184eb34014de94d75ea8 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 17 Jun 2007 19:25:04 +0000
Subject: Fixed inverted map texture problem. Added(from trunk) the loading of
 terrain files defined in the region.xml files.

---
 Common/OpenSim.Framework/Types/RegionInfo.cs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'Common/OpenSim.Framework')

diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/Common/OpenSim.Framework/Types/RegionInfo.cs
index ad1399d..2c24327 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/Common/OpenSim.Framework/Types/RegionInfo.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Globalization;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Console;
@@ -178,6 +179,32 @@ namespace OpenSim.Framework.Types
                         this.IPListenAddr = attri;
                     }
                 }
+
+                attri = "";
+                attri = configData.GetAttribute("TerrainFile");
+                if (attri == "")
+                {
+                    this.estateSettings.terrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
+                    configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);
+                }
+                else
+                {
+                    this.estateSettings.terrainFile = attri;
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("TerrainMultiplier");
+                if (attri == "")
+                {
+                    string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
+                    this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
+                    configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
+                }
+                else
+                {
+                    this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);
+                }
+
                 attri = "";
                 attri = configData.GetAttribute("MasterAvatarFirstName");
                 if (attri == "")
-- 
cgit v1.1