aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
diff options
context:
space:
mode:
authorRobert Adams2013-11-05 21:42:27 -0800
committerRobert Adams2013-11-05 21:42:27 -0800
commita75ce7423c008414528c1031bb9645478972a70f (patch)
tree3c96d914351c75948a2becf35a5775ead07d3f8f /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
parentvarregion: properly sense size of terrain heightmap and store as (diff)
parentAdded sending (for now hard-coded) sim isze in SendMapBlockSplit() (diff)
downloadopensim-SC-a75ce7423c008414528c1031bb9645478972a70f.zip
opensim-SC-a75ce7423c008414528c1031bb9645478972a70f.tar.gz
opensim-SC-a75ce7423c008414528c1031bb9645478972a70f.tar.bz2
opensim-SC-a75ce7423c008414528c1031bb9645478972a70f.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 00fa5db..4671ed0 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1435,6 +1435,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1435 1435
1436 mapReply.AgentData.AgentID = AgentId; 1436 mapReply.AgentData.AgentID = AgentId;
1437 mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length]; 1437 mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length];
1438 mapReply.Size = new MapBlockReplyPacket.SizeBlock[mapBlocks2.Length];
1438 mapReply.AgentData.Flags = flag; 1439 mapReply.AgentData.Flags = flag;
1439 1440
1440 for (int i = 0; i < mapBlocks2.Length; i++) 1441 for (int i = 0; i < mapBlocks2.Length; i++)
@@ -1449,6 +1450,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1449 mapReply.Data[i].RegionFlags = mapBlocks2[i].RegionFlags; 1450 mapReply.Data[i].RegionFlags = mapBlocks2[i].RegionFlags;
1450 mapReply.Data[i].Access = mapBlocks2[i].Access; 1451 mapReply.Data[i].Access = mapBlocks2[i].Access;
1451 mapReply.Data[i].Agents = mapBlocks2[i].Agents; 1452 mapReply.Data[i].Agents = mapBlocks2[i].Agents;
1453
1454 // TODO: hookup varregion sim size here
1455 mapReply.Size[i] = new MapBlockReplyPacket.SizeBlock();
1456 mapReply.Size[i].SizeX = 256;
1457 mapReply.Size[i].SizeY = 256;
1452 } 1458 }
1453 OutPacket(mapReply, ThrottleOutPacketType.Land); 1459 OutPacket(mapReply, ThrottleOutPacketType.Land);
1454 } 1460 }