From fad4d4dc5525133032116eebc62dbe423fb22b57 Mon Sep 17 00:00:00 2001
From: Magnuz Binder
Date: Wed, 28 Jan 2015 11:32:43 +0100
Subject: Permit loading of LLRAW files bigger than 256x256 by calculating size
 based on file size rather than assuming 256x256, same as for RAW32.

---
 OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index 62d232e..ce93a180 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -147,7 +147,15 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 
         public ITerrainChannel LoadStream(Stream s)
         {
-            TerrainChannel retval = new TerrainChannel();
+            // The raw format doesn't contain any dimension information.
+            // Guess the square dimensions by using the length of the raw file.
+            double dimension = Math.Sqrt((double)(s.Length / 13));
+            // Regions are always multiples of 256.
+            int trimmedDimension = (int)dimension - ((int)dimension % (int)Constants.RegionSize);
+            if (trimmedDimension < Constants.RegionSize)
+                trimmedDimension = (int)Constants.RegionSize;
+
+            TerrainChannel retval = new TerrainChannel(trimmedDimension, trimmedDimension);
 
             BinaryReader bs = new BinaryReader(s);
             int y;
-- 
cgit v1.1