From a6df626868c9715288b2ef025efe18a015256a74 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 23 Sep 2016 13:03:16 +0100 Subject: [PATCH] add a version tag to wind and cloud data updates to iclient --- OpenSim/Framework/IClientAPI.cs | 4 ++-- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 11 +++++++---- OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs | 2 +- OpenSim/Region/CoreModules/World/Wind/WindModule.cs | 2 +- .../InternetRelayClientView/Server/IRCClientView.cs | 4 ++-- OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 ++-- OpenSim/Tests/Common/Mock/TestClient.cs | 4 ++-- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index cafbd1f987..f1290b9a2a 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -1142,8 +1142,8 @@ namespace OpenSim.Framework void SendLayerData(float[] map); void SendLayerData(int px, int py, float[] map); - void SendWindData(Vector2[] windSpeeds); - void SendCloudData(float[] cloudCover); + void SendWindData(int version, Vector2[] windSpeeds); + void SendCloudData(int version, float[] cloudCover); /// /// Sent when an agent completes its movement into a region. diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2d337f1e29..15f1004b39 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 /// Send the wind matrix to the client /// /// 16x16 array of wind speeds +/* public virtual void SendWindData(Vector2[] windSpeeds) { Util.FireAndForget(DoSendWindData, windSpeeds, "LLClientView.SendWindData"); + DoSendWindData(windSpeeds); } - +*/ /// /// Send the cloud matrix to the client /// /// 16x16 array of cloud densities - public virtual void SendCloudData(float[] cloudDensity) + public virtual void SendCloudData(int version, float[] cloudDensity) { Util.FireAndForget(DoSendCloudData, cloudDensity, "LLClientView.SendCloudData"); } @@ -1397,9 +1399,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// Send wind layer information to the client. /// /// - private void DoSendWindData(object o) +// private void DoSendWindData(object o) + public virtual void SendWindData(int version, Vector2[] windSpeeds) { - Vector2[] windSpeeds = (Vector2[])o; +// Vector2[] windSpeeds = (Vector2[])o; TerrainPatch[] patches = new TerrainPatch[2]; patches[0] = new TerrainPatch { Data = new float[16 * 16] }; 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 d217f36c7d..f304307586 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 { if (m_ready) { - client.SendCloudData(cloudCover); + client.SendCloudData(0, cloudCover); } } diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index 9f13d90176..f1de0bc987 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 m_scene.ForEachRootClient(delegate(IClientAPI client) { - client.SendWindData(windSpeeds); + client.SendWindData(0, windSpeeds); }); } diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 427b48ec73..15d31bddbb 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 } - public void SendWindData(Vector2[] windSpeeds) + public void SendWindData(int version, Vector2[] windSpeeds) { } - public void SendCloudData(float[] cloudCover) + public void SendCloudData(int version, float[] cloudCover) { } diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 07413cfd90..1ad71ba4cc 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 { } - public virtual void SendWindData(Vector2[] windSpeeds) { } + public virtual void SendWindData(int version, Vector2[] windSpeeds) { } - public virtual void SendCloudData(float[] cloudCover) { } + public virtual void SendCloudData(int version, float[] cloudCover) { } public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) { diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 6a697f24f3..9251c4fcd3 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs @@ -659,9 +659,9 @@ namespace OpenSim.Tests.Common { } - public virtual void SendWindData(Vector2[] windSpeeds) { } + public virtual void SendWindData(int version, Vector2[] windSpeeds) { } - public virtual void SendCloudData(float[] cloudCover) { } + public virtual void SendCloudData(int version, float[] cloudCover) { } public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) {