aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDalien Talbot2007-09-13 13:09:14 +0000
committerDalien Talbot2007-09-13 13:09:14 +0000
commit7a9f5ed6b351a8d819604e9ad501547fb5fa6947 (patch)
treee62f1d039b953f8a30a10127661e6aea7205146d /OpenSim
parentimplement llGetScale and llSetScale (diff)
downloadopensim-SC_OLD-7a9f5ed6b351a8d819604e9ad501547fb5fa6947.zip
opensim-SC_OLD-7a9f5ed6b351a8d819604e9ad501547fb5fa6947.tar.gz
opensim-SC_OLD-7a9f5ed6b351a8d819604e9ad501547fb5fa6947.tar.bz2
opensim-SC_OLD-7a9f5ed6b351a8d819604e9ad501547fb5fa6947.tar.xz
Fix the terrain heightmap load from images (tested PNG and GIF).
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 943824b..fe6eefb 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -463,7 +463,8 @@ namespace OpenSim.Region.Terrain
463 break; 463 break;
464 464
465 case "img": 465 case "img":
466 heightmap.LoadImage(filenameL); 466 heightmap = heightmap.LoadImage(filenameL);
467 tainted++;
467 break; 468 break;
468 469
469 default: 470 default: