aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-05 21:54:22 +0000
committerJustin Clarke Casey2009-02-05 21:54:22 +0000
commitfae5d25e82aea351899c3d01b5ddb37f33b6852c (patch)
tree000f708ab7467c5094c3375dd0114d77f7234be7
parent* Remove CommanderTestModule as there are several normal modules which effect... (diff)
downloadopensim-SC-fae5d25e82aea351899c3d01b5ddb37f33b6852c.zip
opensim-SC-fae5d25e82aea351899c3d01b5ddb37f33b6852c.tar.gz
opensim-SC-fae5d25e82aea351899c3d01b5ddb37f33b6852c.tar.bz2
opensim-SC-fae5d25e82aea351899c3d01b5ddb37f33b6852c.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=3056
* Clamps negative values to zero when a terrain is exported in LLRAW format, since LLRAW doesn't support negative values. * Thanks jonc!
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
index 88dd3a7..5158525 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
@@ -184,6 +184,13 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
184 for (int x = 0; x < map.Width; x++) 184 for (int x = 0; x < map.Width; x++)
185 { 185 {
186 double t = map[x, (map.Height - 1) - y]; 186 double t = map[x, (map.Height - 1) - y];
187 //if height is less than 0, set it to 0 as
188 //can't save -ve values in a LLRAW file
189 if (t < 0d)
190 {
191 t = 0d;
192 }
193
187 int index = 0; 194 int index = 0;
188 195
189 // The lookup table is pre-sorted, so we either find an exact match or 196 // The lookup table is pre-sorted, so we either find an exact match or