* More tweaking of the various services to work with nonstandard region sizes. * Now, what's available of the terrain will show and it'll be truncated if it's larger on Linden Clients. Parcel minimum is 64 (256/4) for the client to accept it.

1 files changed, 35 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 9142b36..d8f786b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1457,7 +1457,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     //}
                     for (int x = 0; x < 16; x++)
                     {
-                        SendLayerData(x, y, map);
+                        SendLayerData(x, y, LLHeightFieldMoronize(map));
                         Thread.Sleep(35);
                     }
                 }
@@ -1503,7 +1503,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 patches[0] = patchx + 0 + patchy * 16;
 
-                LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(map, patches);
+                LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(((map.Length==65536)? map : LLHeightFieldMoronize(map)), patches);
                 layerpack.Header.Zerocoded = true;
 
                 OutPacket(layerpack, ThrottleOutPacketType.Land);
@@ -1516,6 +1516,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         /// <summary>
+        /// Munges heightfield into the LLUDP backed in restricted heightfield.
+        /// </summary>
+        /// <param name="map">float array in the base; Constants.RegionSize</param>
+        /// <returns>float array in the base 256</returns>
+        internal float[] LLHeightFieldMoronize(float[] map)
+        {
+            if (map.Length == 65536)
+                return map;
+            else
+            {
+                float[] returnmap = new float[65536];
+
+                if (map.Length < 65535)
+                {
+                    // rebase the vector stride to 256
+                    for (int i = 0; i < Constants.RegionSize; i++)
+                        Array.Copy(map, i * (int)Constants.RegionSize, returnmap, i * 256, (int)Constants.RegionSize);
+                }
+                else
+                {
+                    for (int i = 0; i < 256; i++)
+                        Array.Copy(map, i * (int)Constants.RegionSize, returnmap, i * 256, 256);
+                }
+
+                
+                //Array.Copy(map,0,returnmap,0,(map.Length < 65536)? map.Length : 65536);
+
+                return returnmap;
+            }
+
+        }
+
+        /// <summary>
         ///  Send the wind matrix to the client
         /// </summary>
         /// <param name="windSpeeds">16x16 array of wind speeds</param>