aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorRobert Adams2013-09-25 17:21:20 -0700
committerRobert Adams2013-09-28 07:33:56 -0700
commit8c1d80fdfd104b94cb7a4fd247b3baa2a9988ea1 (patch)
tree0423a4cd16f354f21d12162eaa351d9e13ba52fd /OpenSim/Region/ClientStack
parentRemove time based terrain storage in SQLite so revision number can be used (diff)
downloadopensim-SC_OLD-8c1d80fdfd104b94cb7a4fd247b3baa2a9988ea1.zip
opensim-SC_OLD-8c1d80fdfd104b94cb7a4fd247b3baa2a9988ea1.tar.gz
opensim-SC_OLD-8c1d80fdfd104b94cb7a4fd247b3baa2a9988ea1.tar.bz2
opensim-SC_OLD-8c1d80fdfd104b94cb7a4fd247b3baa2a9988ea1.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')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
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 22bff9f..fea9ddf 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