aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorUbitUmarov2016-09-23 13:03:16 +0100
committerUbitUmarov2016-09-23 13:03:16 +0100
commita6df626868c9715288b2ef025efe18a015256a74 (patch)
treec7b6114d2c9a8df39280421cde9141683b8796b6 /OpenSim/Region/ClientStack
parentmove wind generation out of heartbeat to a pool job. Use that to send to all ... (diff)
downloadopensim-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/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs11
1 files changed, 7 insertions, 4 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] };