diff options
author | UbitUmarov | 2015-09-24 20:55:39 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-24 20:55:39 +0100 |
commit | 13b8b17b9a451343d1358e41ddb0a245cbd22939 (patch) | |
tree | 157a993c35a656df4d1c63acb36fdd6c9ce05e3f /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
parent | some cleanup on terrain encoder (diff) | |
download | opensim-SC_OLD-13b8b17b9a451343d1358e41ddb0a245cbd22939.zip opensim-SC_OLD-13b8b17b9a451343d1358e41ddb0a245cbd22939.tar.gz opensim-SC_OLD-13b8b17b9a451343d1358e41ddb0a245cbd22939.tar.bz2 opensim-SC_OLD-13b8b17b9a451343d1358e41ddb0a245cbd22939.tar.xz |
we still don't have extended wind and cloud neither do viewers
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 6684611..c966f15 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1406,12 +1406,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1406 | patches[1].Data[x] = windSpeeds[x].Y; | 1406 | patches[1].Data[x] = windSpeeds[x].Y; |
1407 | } | 1407 | } |
1408 | 1408 | ||
1409 | // neither we or viewers have extended wind | ||
1409 | byte layerType = (byte)TerrainPatch.LayerType.Wind; | 1410 | byte layerType = (byte)TerrainPatch.LayerType.Wind; |
1410 | if (m_scene.RegionInfo.RegionSizeX > Constants.RegionSize || m_scene.RegionInfo.RegionSizeY > Constants.RegionSize) | ||
1411 | layerType = (byte)TerrainPatch.LayerType.WindExtended; | ||
1412 | 1411 | ||
1413 | LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacket(patches, layerType, | 1412 | LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacketStandardSize(patches, layerType); |
1414 | (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY); | ||
1415 | layerpack.Header.Zerocoded = true; | 1413 | layerpack.Header.Zerocoded = true; |
1416 | OutPacket(layerpack, ThrottleOutPacketType.Wind); | 1414 | OutPacket(layerpack, ThrottleOutPacketType.Wind); |
1417 | } | 1415 | } |
@@ -1434,13 +1432,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1434 | patches[0].Data[y * 16 + x] = cloudCover[y * 16 + x]; | 1432 | patches[0].Data[y * 16 + x] = cloudCover[y * 16 + x]; |
1435 | } | 1433 | } |
1436 | } | 1434 | } |
1437 | 1435 | // neither we or viewers have extended clouds | |
1438 | byte layerType = (byte)TerrainPatch.LayerType.Cloud; | 1436 | byte layerType = (byte)TerrainPatch.LayerType.Cloud; |
1439 | if (m_scene.RegionInfo.RegionSizeX > Constants.RegionSize || m_scene.RegionInfo.RegionSizeY > Constants.RegionSize) | ||
1440 | layerType = (byte)TerrainPatch.LayerType.CloudExtended; | ||
1441 | 1437 | ||
1442 | LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacket(patches, layerType, | 1438 | LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacketStandardSize(patches, layerType); |
1443 | (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY); | ||
1444 | layerpack.Header.Zerocoded = true; | 1439 | layerpack.Header.Zerocoded = true; |
1445 | OutPacket(layerpack, ThrottleOutPacketType.Cloud); | 1440 | OutPacket(layerpack, ThrottleOutPacketType.Cloud); |
1446 | } | 1441 | } |