diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/TerrainCompressor.cs | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 9d39daa..05dd764 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1309,18 +1309,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1309 | { | 1309 | { |
1310 | Vector2[] windSpeeds = (Vector2[])o; | 1310 | Vector2[] windSpeeds = (Vector2[])o; |
1311 | TerrainPatch[] patches = new TerrainPatch[2]; | 1311 | TerrainPatch[] patches = new TerrainPatch[2]; |
1312 | patches[0] = new TerrainPatch(); | 1312 | patches[0] = new TerrainPatch { Data = new float[16 * 16] }; |
1313 | patches[0].Data = new float[16 * 16]; | 1313 | patches[1] = new TerrainPatch { Data = new float[16 * 16] }; |
1314 | patches[1] = new TerrainPatch(); | ||
1315 | patches[1].Data = new float[16 * 16]; | ||
1316 | 1314 | ||
1317 | for (int y = 0; y < 16; y++) | 1315 | for (int x = 0; x < 16 * 16; x++) |
1318 | { | 1316 | { |
1319 | for (int x = 0; x < 16; x++) | 1317 | patches[0].Data[x] = windSpeeds[x].X; |
1320 | { | 1318 | patches[1].Data[x] = windSpeeds[x].Y; |
1321 | patches[0].Data[y * 16 + x] = windSpeeds[y * 16 + x].X; | ||
1322 | patches[1].Data[y * 16 + x] = windSpeeds[y * 16 + x].Y; | ||
1323 | } | ||
1324 | } | 1319 | } |
1325 | 1320 | ||
1326 | byte layerType = (byte)TerrainPatch.LayerType.Wind; | 1321 | byte layerType = (byte)TerrainPatch.LayerType.Wind; |
diff --git a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs index bdb748a..b41691f 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainCompressor.cs | |||
@@ -192,7 +192,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
192 | 192 | ||
193 | int wbits; | 193 | int wbits; |
194 | int[] patch = CompressPatch(patchData, header, 10, out wbits); | 194 | int[] patch = CompressPatch(patchData, header, 10, out wbits); |
195 | wbits = EncodePatchHeader(output, header, patch, (uint)pRegionSizeX, (uint)pRegionSizeY, wbits); | 195 | wbits = EncodePatchHeader(output, header, patch, Constants.RegionSize, Constants.RegionSize, wbits); |
196 | EncodePatch(output, patch, 0, wbits); | 196 | EncodePatch(output, patch, 0, wbits); |
197 | } | 197 | } |
198 | 198 | ||