diff options
author | Robert Adams | 2014-04-12 17:37:57 -0700 |
---|---|---|
committer | Robert Adams | 2014-04-12 17:37:57 -0700 |
commit | c8914d22ebb66fd9601161c9826d8b29ff6cb561 (patch) | |
tree | ca52fe7a5b864bf7f0c208a13c9e1fd361091d89 /OpenSim/Region/Framework/Scenes/TerrainCompressor.cs | |
parent | Refactor: Rename GetOtherSetting to GetSetting and make SetOtherSetting private (diff) | |
download | opensim-SC_OLD-c8914d22ebb66fd9601161c9826d8b29ff6cb561.zip opensim-SC_OLD-c8914d22ebb66fd9601161c9826d8b29ff6cb561.tar.gz opensim-SC_OLD-c8914d22ebb66fd9601161c9826d8b29ff6cb561.tar.bz2 opensim-SC_OLD-c8914d22ebb66fd9601161c9826d8b29ff6cb561.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/TerrainCompressor.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
81 | BuildQuantizeTable16(); | 81 | BuildQuantizeTable16(); |
82 | } | 82 | } |
83 | 83 | ||
84 | // Unused: left for historical reference. | 84 | // Used to send cloud and wind patches |
85 | public static LayerDataPacket CreateLayerDataPacket(TerrainPatch[] patches, byte type, int pRegionSizeX, | 85 | public static LayerDataPacket CreateLayerDataPacket(TerrainPatch[] patches, byte type, int pRegionSizeX, |
86 | int pRegionSizeY) | 86 | int pRegionSizeY) |
87 | { | 87 | { |
@@ -275,7 +275,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
275 | } | 275 | } |
276 | 276 | ||
277 | header.DCOffset = zmin; | 277 | header.DCOffset = zmin; |
278 | header.Range = (int)(zmax - zmin + 1.0f); | 278 | header.Range = (int)((zmax - zmin) + 1.0f); |
279 | 279 | ||
280 | return header; | 280 | return header; |
281 | } | 281 | } |
@@ -491,7 +491,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
491 | lineout[CopyMatrix16[uptr + column]] = (int)(total * QuantizeTable16[uptr + column]); | 491 | lineout[CopyMatrix16[uptr + column]] = (int)(total * QuantizeTable16[uptr + column]); |
492 | } | 492 | } |
493 | } | 493 | } |
494 | */ | ||
495 | 494 | ||
496 | private static void DCTColumn16(float[] linein, int[] lineout, int column) | 495 | private static void DCTColumn16(float[] linein, int[] lineout, int column) |
497 | { | 496 | { |
@@ -524,6 +523,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
524 | lineout[CopyMatrix16[uptr + column]] = (int) (total*QuantizeTable16[uptr + column]); | 523 | lineout[CopyMatrix16[uptr + column]] = (int) (total*QuantizeTable16[uptr + column]); |
525 | } | 524 | } |
526 | } | 525 | } |
526 | */ | ||
527 | 527 | ||
528 | private static int DCTColumn16Wbits(float[] linein, int[] lineout, int column, int wbits, int maxwbits) | 528 | private static int DCTColumn16Wbits(float[] linein, int[] lineout, int column, int wbits, int maxwbits) |
529 | { | 529 | { |