diff options
author | Robert Adams | 2013-09-25 17:21:20 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-25 17:30:53 -0700 |
commit | fbc9072a5ca4ae3c8474964fbd4ef663eeed1377 (patch) | |
tree | f422d4a107c5318c02255e8cc4432a83608bcdf8 /OpenSim/Region/ClientStack/Linden | |
parent | Remove time based terrain storage in SQLite so revision number can be used (diff) | |
download | opensim-SC-fbc9072a5ca4ae3c8474964fbd4ef663eeed1377.zip opensim-SC-fbc9072a5ca4ae3c8474964fbd4ef663eeed1377.tar.gz opensim-SC-fbc9072a5ca4ae3c8474964fbd4ef663eeed1377.tar.bz2 opensim-SC-fbc9072a5ca4ae3c8474964fbd4ef663eeed1377.tar.xz |
varregion: serious rework of TerrainChannel:
-- addition of varaible region size in X and Y
-- internal storage of heightmap changed from double[] to short[]
-- helper routines for handling internal structure while keeping existing API
-- to and from XML that adds region size information (for downward compatibility,
output in the legacy XML format if X and Y are 256)
Updated and commented Constants.RegionSize but didn't change the name for compatibility.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 7b7daed..3396c32 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1240,9 +1240,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1240 | try | 1240 | try |
1241 | { | 1241 | { |
1242 | int[] patches = new int[] { py * 16 + px }; | 1242 | int[] patches = new int[] { py * 16 + px }; |
1243 | float[] heightmap = (map.Length == 65536) ? | 1243 | float[] heightmap = (map.Length == 65536) ? map : LLHeightFieldMoronize(map); |
1244 | map : | ||
1245 | LLHeightFieldMoronize(map); | ||
1246 | 1244 | ||
1247 | LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); | 1245 | LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); |
1248 | 1246 | ||