diff options
author | UbitUmarov | 2016-09-23 13:03:16 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-23 13:03:16 +0100 |
commit | a6df626868c9715288b2ef025efe18a015256a74 (patch) | |
tree | c7b6114d2c9a8df39280421cde9141683b8796b6 /OpenSim/Region | |
parent | move wind generation out of heartbeat to a pool job. Use that to send to all ... (diff) | |
download | opensim-SC_OLD-a6df626868c9715288b2ef025efe18a015256a74.zip opensim-SC_OLD-a6df626868c9715288b2ef025efe18a015256a74.tar.gz opensim-SC_OLD-a6df626868c9715288b2ef025efe18a015256a74.tar.bz2 opensim-SC_OLD-a6df626868c9715288b2ef025efe18a015256a74.tar.xz |
add a version tag to wind and cloud data updates to iclient
Diffstat (limited to 'OpenSim/Region')
5 files changed, 13 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2d337f1..15f1004 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1379,16 +1379,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1379 | /// Send the wind matrix to the client | 1379 | /// Send the wind matrix to the client |
1380 | /// </summary> | 1380 | /// </summary> |
1381 | /// <param name="windSpeeds">16x16 array of wind speeds</param> | 1381 | /// <param name="windSpeeds">16x16 array of wind speeds</param> |
1382 | /* | ||
1382 | public virtual void SendWindData(Vector2[] windSpeeds) | 1383 | public virtual void SendWindData(Vector2[] windSpeeds) |
1383 | { | 1384 | { |
1384 | Util.FireAndForget(DoSendWindData, windSpeeds, "LLClientView.SendWindData"); | 1385 | Util.FireAndForget(DoSendWindData, windSpeeds, "LLClientView.SendWindData"); |
1386 | DoSendWindData(windSpeeds); | ||
1385 | } | 1387 | } |
1386 | 1388 | */ | |
1387 | /// <summary> | 1389 | /// <summary> |
1388 | /// Send the cloud matrix to the client | 1390 | /// Send the cloud matrix to the client |
1389 | /// </summary> | 1391 | /// </summary> |
1390 | /// <param name="windSpeeds">16x16 array of cloud densities</param> | 1392 | /// <param name="windSpeeds">16x16 array of cloud densities</param> |
1391 | public virtual void SendCloudData(float[] cloudDensity) | 1393 | public virtual void SendCloudData(int version, float[] cloudDensity) |
1392 | { | 1394 | { |
1393 | Util.FireAndForget(DoSendCloudData, cloudDensity, "LLClientView.SendCloudData"); | 1395 | Util.FireAndForget(DoSendCloudData, cloudDensity, "LLClientView.SendCloudData"); |
1394 | } | 1396 | } |
@@ -1397,9 +1399,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1397 | /// Send wind layer information to the client. | 1399 | /// Send wind layer information to the client. |
1398 | /// </summary> | 1400 | /// </summary> |
1399 | /// <param name="o"></param> | 1401 | /// <param name="o"></param> |
1400 | private void DoSendWindData(object o) | 1402 | // private void DoSendWindData(object o) |
1403 | public virtual void SendWindData(int version, Vector2[] windSpeeds) | ||
1401 | { | 1404 | { |
1402 | Vector2[] windSpeeds = (Vector2[])o; | 1405 | // Vector2[] windSpeeds = (Vector2[])o; |
1403 | TerrainPatch[] patches = new TerrainPatch[2]; | 1406 | TerrainPatch[] patches = new TerrainPatch[2]; |
1404 | patches[0] = new TerrainPatch { Data = new float[16 * 16] }; | 1407 | patches[0] = new TerrainPatch { Data = new float[16 * 16] }; |
1405 | patches[1] = new TerrainPatch { Data = new float[16 * 16] }; | 1408 | patches[1] = new TerrainPatch { Data = new float[16 * 16] }; |
diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs index d217f36..f304307 100644 --- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs +++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs | |||
@@ -203,7 +203,7 @@ namespace OpenSim.Region.CoreModules.World | |||
203 | { | 203 | { |
204 | if (m_ready) | 204 | if (m_ready) |
205 | { | 205 | { |
206 | client.SendCloudData(cloudCover); | 206 | client.SendCloudData(0, cloudCover); |
207 | } | 207 | } |
208 | } | 208 | } |
209 | 209 | ||
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index 9f13d90..f1de0bc 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs | |||
@@ -430,7 +430,7 @@ namespace OpenSim.Region.CoreModules | |||
430 | 430 | ||
431 | m_scene.ForEachRootClient(delegate(IClientAPI client) | 431 | m_scene.ForEachRootClient(delegate(IClientAPI client) |
432 | { | 432 | { |
433 | client.SendWindData(windSpeeds); | 433 | client.SendWindData(0, windSpeeds); |
434 | }); | 434 | }); |
435 | 435 | ||
436 | } | 436 | } |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 427b48e..15d31bd 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -1023,12 +1023,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1023 | 1023 | ||
1024 | } | 1024 | } |
1025 | 1025 | ||
1026 | public void SendWindData(Vector2[] windSpeeds) | 1026 | public void SendWindData(int version, Vector2[] windSpeeds) |
1027 | { | 1027 | { |
1028 | 1028 | ||
1029 | } | 1029 | } |
1030 | 1030 | ||
1031 | public void SendCloudData(float[] cloudCover) | 1031 | public void SendCloudData(int version, float[] cloudCover) |
1032 | { | 1032 | { |
1033 | 1033 | ||
1034 | } | 1034 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 07413cf..1ad71ba 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -724,9 +724,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
724 | { | 724 | { |
725 | } | 725 | } |
726 | 726 | ||
727 | public virtual void SendWindData(Vector2[] windSpeeds) { } | 727 | public virtual void SendWindData(int version, Vector2[] windSpeeds) { } |
728 | 728 | ||
729 | public virtual void SendCloudData(float[] cloudCover) { } | 729 | public virtual void SendCloudData(int version, float[] cloudCover) { } |
730 | 730 | ||
731 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) | 731 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) |
732 | { | 732 | { |