aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-08-02 20:51:06 +0000
committerAdam Frisby2007-08-02 20:51:06 +0000
commitcd2a411afe62412f6ac2df29b7426ba25ee00f43 (patch)
tree752869b98dfeadd2a18334c8243408c6ec13b19d
parent* Fixed several issues with Terrain (diff)
downloadopensim-SC_OLD-cd2a411afe62412f6ac2df29b7426ba25ee00f43.zip
opensim-SC_OLD-cd2a411afe62412f6ac2df29b7426ba25ee00f43.tar.gz
opensim-SC_OLD-cd2a411afe62412f6ac2df29b7426ba25ee00f43.tar.bz2
opensim-SC_OLD-cd2a411afe62412f6ac2df29b7426ba25ee00f43.tar.xz
* Terrain load variables now work. HiRAW exporter works wonderfully. :D
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 09e6335..27259b9 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -365,23 +365,26 @@ namespace OpenSim.Region.Terrain
365 break; 365 break;
366 366
367 case "load": 367 case "load":
368 args[2].Replace("%name%", simName); 368 string filenameL = args[2].Replace("%name%", simName);
369 filenameL = filenameL.Replace("%x%", this.offsetX.ToString());
370 filenameL = filenameL.Replace("%y%", this.offsetY.ToString());
371
369 switch (args[1].ToLower()) 372 switch (args[1].ToLower())
370 { 373 {
371 case "f32": 374 case "f32":
372 LoadFromFileF32(args[2]); 375 LoadFromFileF32(filenameL);
373 break; 376 break;
374 377
375 case "f64": 378 case "f64":
376 LoadFromFileF64(args[2]); 379 LoadFromFileF64(filenameL);
377 break; 380 break;
378 381
379 case "raw": 382 case "raw":
380 LoadFromFileSLRAW(args[2]); 383 LoadFromFileSLRAW(filenameL);
381 break; 384 break;
382 385
383 case "img": 386 case "img":
384 heightmap.LoadImage(args[2]); 387 heightmap.LoadImage(filenameL);
385 break; 388 break;
386 389
387 default: 390 default: