aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2014-02-22 15:04:28 -0800
committerRobert Adams2014-02-22 15:04:28 -0800
commit0b213af675d6859b4bdace98b249ea18e9ca32f2 (patch)
tree51169034c961e38baf56654b2c2c14440620ab8f /OpenSim/Region
parentAdded 2 new behaviors to pCampBot (diff)
downloadopensim-SC_OLD-0b213af675d6859b4bdace98b249ea18e9ca32f2.zip
opensim-SC_OLD-0b213af675d6859b4bdace98b249ea18e9ca32f2.tar.gz
opensim-SC_OLD-0b213af675d6859b4bdace98b249ea18e9ca32f2.tar.bz2
opensim-SC_OLD-0b213af675d6859b4bdace98b249ea18e9ca32f2.tar.xz
Fix problem of hurricane speed winds. Thanks Vegaslon.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs15
-rw-r--r--OpenSim/Region/Framework/Scenes/TerrainCompressor.cs2
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