From 6adc810eaaf067e25ac88b023a20543577a2d5fd Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 5 Jun 2012 19:40:16 +0100
Subject: [PATCH] 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.
---
 .../Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 71c71e6cd5..7a0db2664c 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -178,8 +178,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 //                            int sztmp = bs.ReadInt16() + 1;
 //                            fileWidth = sztmp;
 //                            fileHeight = sztmp;
-                            bs.ReadInt16();
-                            bs.ReadInt16();
                             bs.ReadInt16();
                             bs.ReadInt16();
                             break;