aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/RegionInfo.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-05-27 09:57:04 +0000
committerAdam Frisby2007-05-27 09:57:04 +0000
commiteb7ca40139e6192125b05713eff09e30ed2e3ef1 (patch)
tree360b9826ef8cd4fffb2c229833059c7c540f9eb9 /OpenSim/OpenSim.RegionServer/RegionInfo.cs
parentI be experimentin' (diff)
downloadopensim-SC_OLD-eb7ca40139e6192125b05713eff09e30ed2e3ef1.zip
opensim-SC_OLD-eb7ca40139e6192125b05713eff09e30ed2e3ef1.tar.gz
opensim-SC_OLD-eb7ca40139e6192125b05713eff09e30ed2e3ef1.tar.bz2
opensim-SC_OLD-eb7ca40139e6192125b05713eff09e30ed2e3ef1.tar.xz
* Fixed dumb mistake with terrain default loading.
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/RegionInfo.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionInfo.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index 1608f4b..c42b434 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -202,6 +202,10 @@ namespace OpenSim
202 this.TerrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Terrain file default", "default.r32"); 202 this.TerrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Terrain file default", "default.r32");
203 configData.SetAttribute("TerrainFile", this.TerrainFile); 203 configData.SetAttribute("TerrainFile", this.TerrainFile);
204 } 204 }
205 else
206 {
207 this.TerrainFile = attri;
208 }
205 209
206 attri = ""; 210 attri = "";
207 attri = configData.GetAttribute("TerrainMultiplier"); 211 attri = configData.GetAttribute("TerrainMultiplier");
@@ -210,6 +214,10 @@ namespace OpenSim
210 this.TerrainMultiplier = Convert.ToDouble(OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Terrain multiplier", "60.0")); 214 this.TerrainMultiplier = Convert.ToDouble(OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Terrain multiplier", "60.0"));
211 configData.SetAttribute("TerrainMultiplier", this.TerrainMultiplier.ToString()); 215 configData.SetAttribute("TerrainMultiplier", this.TerrainMultiplier.ToString());
212 } 216 }
217 else
218 {
219 this.TerrainMultiplier = Convert.ToDouble(attri);
220 }
213 221
214 222
215 if (!isSandbox) 223 if (!isSandbox)