OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a version tag to wind and cloud data updates to iclient

0.9.0-post-fixes
UbitUmarov 2016-09-23 13:03:16 +01:00
parent 984cb38583
commit a6df626868
7 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/IClientAPI.cs
View File

@ -1142,8 +1142,8 @@ namespace OpenSim.Framework
void SendLayerData(float[] map); void SendLayerData(float[] map);
void SendLayerData(int px, int py, float[] map); void SendLayerData(int px, int py, float[] map);
void SendWindData(Vector2[] windSpeeds); void SendWindData(int version, Vector2[] windSpeeds);
void SendCloudData(float[] cloudCover); void SendCloudData(int version, float[] cloudCover);
/// <summary> /// <summary>
/// Sent when an agent completes its movement into a region. /// Sent when an agent completes its movement into a region.

11
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -1379,16 +1379,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Send the wind matrix to the client /// Send the wind matrix to the client
/// </summary> /// </summary>
/// <param name="windSpeeds">16x16 array of wind speeds</param> /// <param name="windSpeeds">16x16 array of wind speeds</param>
/*
public virtual void SendWindData(Vector2[] windSpeeds) public virtual void SendWindData(Vector2[] windSpeeds)
{ {
Util.FireAndForget(DoSendWindData, windSpeeds, "LLClientView.SendWindData"); Util.FireAndForget(DoSendWindData, windSpeeds, "LLClientView.SendWindData");
DoSendWindData(windSpeeds);
} }
*/
/// <summary> /// <summary>
/// Send the cloud matrix to the client /// Send the cloud matrix to the client
/// </summary> /// </summary>
/// <param name="windSpeeds">16x16 array of cloud densities</param> /// <param name="windSpeeds">16x16 array of cloud densities</param>
public virtual void SendCloudData(float[] cloudDensity) public virtual void SendCloudData(int version, float[] cloudDensity)
{ {
Util.FireAndForget(DoSendCloudData, cloudDensity, "LLClientView.SendCloudData"); Util.FireAndForget(DoSendCloudData, cloudDensity, "LLClientView.SendCloudData");
} }
@ -1397,9 +1399,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Send wind layer information to the client. /// Send wind layer information to the client.
/// </summary> /// </summary>
/// <param name="o"></param> /// <param name="o"></param>
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]; TerrainPatch[] patches = new TerrainPatch[2];
patches[0] = new TerrainPatch { Data = new float[16 * 16] }; patches[0] = new TerrainPatch { Data = new float[16 * 16] };
patches[1] = new TerrainPatch { Data = new float[16 * 16] }; patches[1] = new TerrainPatch { Data = new float[16 * 16] };

2
OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
View File

@ -203,7 +203,7 @@ namespace OpenSim.Region.CoreModules.World
{ {
if (m_ready) if (m_ready)
{ {
client.SendCloudData(cloudCover); client.SendCloudData(0, cloudCover);
} }
} }

2
OpenSim/Region/CoreModules/World/Wind/WindModule.cs
View File

@ -430,7 +430,7 @@ namespace OpenSim.Region.CoreModules
m_scene.ForEachRootClient(delegate(IClientAPI client) m_scene.ForEachRootClient(delegate(IClientAPI client)
{ {
client.SendWindData(windSpeeds); client.SendWindData(0, windSpeeds);
}); });
} }

4
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -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)
{ {
} }

4
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -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) public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
{ {

4
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -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) public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
{ {