aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-05 19:40:16 +0100
committerJustin Clark-Casey (justincc)2012-06-05 19:40:16 +0100
commit6adc810eaaf067e25ac88b023a20543577a2d5fd (patch)
tree0aa9b21441660ff79997658386fd4f86a33ded98 /OpenSim/Region/CoreModules
parentminor: Add user feedback when executing fix-phantoms (diff)
downloadopensim-SC_OLD-6adc810eaaf067e25ac88b023a20543577a2d5fd.zip
opensim-SC_OLD-6adc810eaaf067e25ac88b023a20543577a2d5fd.tar.gz
opensim-SC_OLD-6adc810eaaf067e25ac88b023a20543577a2d5fd.tar.bz2
opensim-SC_OLD-6adc810eaaf067e25ac88b023a20543577a2d5fd.tar.xz
Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen file when loaded from a stream.
Fixes a bug introduced 2 weeks ago in 67ebe80 Thanks to Plugh for pointing this out.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 71c71e6..7a0db26 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -180,8 +180,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
180// fileHeight = sztmp; 180// fileHeight = sztmp;
181 bs.ReadInt16(); 181 bs.ReadInt16();
182 bs.ReadInt16(); 182 bs.ReadInt16();
183 bs.ReadInt16();
184 bs.ReadInt16();
185 break; 183 break;
186 case "XPTS": 184 case "XPTS":
187// fileWidth = bs.ReadInt16(); 185// fileWidth = bs.ReadInt16();