aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorMW2007-06-17 19:25:04 +0000
committerMW2007-06-17 19:25:04 +0000
commit99a308007c6c13dc13a2184eb34014de94d75ea8 (patch)
treeb696f870406953b7465313e9eda4210c94f85a38 /Common
parentEach Region will now generate a texture image of their terrain and this will ... (diff)
downloadopensim-SC_OLD-99a308007c6c13dc13a2184eb34014de94d75ea8.zip
opensim-SC_OLD-99a308007c6c13dc13a2184eb34014de94d75ea8.tar.gz
opensim-SC_OLD-99a308007c6c13dc13a2184eb34014de94d75ea8.tar.bz2
opensim-SC_OLD-99a308007c6c13dc13a2184eb34014de94d75ea8.tar.xz
Fixed inverted map texture problem.
Added(from trunk) the loading of terrain files defined in the region.xml files.
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenSim.Framework/Types/RegionInfo.cs27
1 files changed, 27 insertions, 0 deletions
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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using System.Globalization;
31using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
32using OpenSim.Framework.Utilities; 33using OpenSim.Framework.Utilities;
33using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
@@ -178,6 +179,32 @@ namespace OpenSim.Framework.Types
178 this.IPListenAddr = attri; 179 this.IPListenAddr = attri;
179 } 180 }
180 } 181 }
182
183 attri = "";
184 attri = configData.GetAttribute("TerrainFile");
185 if (attri == "")
186 {
187 this.estateSettings.terrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
188 configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);
189 }
190 else
191 {
192 this.estateSettings.terrainFile = attri;
193 }
194
195 attri = "";
196 attri = configData.GetAttribute("TerrainMultiplier");
197 if (attri == "")
198 {
199 string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
200 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
201 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
202 }
203 else
204 {
205 this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);
206 }
207
181 attri = ""; 208 attri = "";
182 attri = configData.GetAttribute("MasterAvatarFirstName"); 209 attri = configData.GetAttribute("MasterAvatarFirstName");
183 if (attri == "") 210 if (attri == "")