From c8914d22ebb66fd9601161c9826d8b29ff6cb561 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 12 Apr 2014 17:37:57 -0700
Subject: BulletSim: reduce the terrain collison margin to be the same as other
 objects in the world.

This was originally changed in an attempt to make vehicles work better
but the effect was not that large and it causes avatars to float
above the terrain.
---
 OpenSim/Region/Framework/Scenes/TerrainCompressor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
index b41691f..1107a2a 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             BuildQuantizeTable16();
         }
 
-        // Unused: left for historical reference.
+        // Used to send cloud and wind patches
         public static LayerDataPacket CreateLayerDataPacket(TerrainPatch[] patches, byte type, int pRegionSizeX,
                                                             int pRegionSizeY)
         {
@@ -275,7 +275,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             header.DCOffset = zmin;
-            header.Range = (int)(zmax - zmin + 1.0f);
+            header.Range = (int)((zmax - zmin) + 1.0f);
 
             return header;
         }
@@ -491,7 +491,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         lineout[CopyMatrix16[uptr + column]] = (int)(total * QuantizeTable16[uptr + column]);
                         }
                 }
-        */
 
         private static void DCTColumn16(float[] linein, int[] lineout, int column)
         {
@@ -524,6 +523,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 lineout[CopyMatrix16[uptr + column]] = (int) (total*QuantizeTable16[uptr + column]);
             }
         }
+        */
 
         private static int DCTColumn16Wbits(float[] linein, int[] lineout, int column, int wbits, int maxwbits)
         {
-- 
cgit v1.1