aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
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
parentvarregion: properly sense size of terrain heightmap and store as (diff)
parentAdded sending (for now hard-coded) sim isze in SendMapBlockSplit() (diff)
downloadopensim-SC_OLD-a75ce7423c008414528c1031bb9645478972a70f.zip
opensim-SC_OLD-a75ce7423c008414528c1031bb9645478972a70f.tar.gz
opensim-SC_OLD-a75ce7423c008414528c1031bb9645478972a70f.tar.bz2
opensim-SC_OLD-a75ce7423c008414528c1031bb9645478972a70f.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs23
2 files changed, 29 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 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 3bd1ef1..c0a4e56 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -134,6 +134,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
134 134
135 StatsManager.RegisterStat( 135 StatsManager.RegisterStat(
136 new Stat( 136 new Stat(
137 "IncomingPacketsResentCount",
138 "Number of inbound packets that clients indicate are resends.",
139 "",
140 "",
141 "clientstack",
142 scene.Name,
143 StatType.Pull,
144 MeasuresOfInterest.AverageChangeOverTime,
145 stat => stat.Value = m_udpServer.IncomingPacketsResentCount,
146 StatVerbosity.Debug));
147
148 StatsManager.RegisterStat(
149 new Stat(
137 "OutgoingUDPSendsCount", 150 "OutgoingUDPSendsCount",
138 "Number of UDP sends performed", 151 "Number of UDP sends performed",
139 "", 152 "",
@@ -318,6 +331,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
318 internal int PacketsSentCount { get; set; } 331 internal int PacketsSentCount { get; set; }
319 332
320 /// <summary> 333 /// <summary>
334 /// Record how many incoming packets are indicated as resends by clients.
335 /// </summary>
336 internal int IncomingPacketsResentCount { get; set; }
337
338 /// <summary>
321 /// Record how many inbound packets could not be recognized as LLUDP packets. 339 /// Record how many inbound packets could not be recognized as LLUDP packets.
322 /// </summary> 340 /// </summary>
323 public int IncomingMalformedPacketCount { get; private set; } 341 public int IncomingMalformedPacketCount { get; private set; }
@@ -1467,6 +1485,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1467 1485
1468 #region Incoming Packet Accounting 1486 #region Incoming Packet Accounting
1469 1487
1488 // We're not going to worry about interlock yet since its not currently critical that this total count
1489 // is 100% correct
1490 if (packet.Header.Resent)
1491 IncomingPacketsResentCount++;
1492
1470 // Check the archive of received reliable packet IDs to see whether we already received this packet 1493 // Check the archive of received reliable packet IDs to see whether we already received this packet
1471 if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence)) 1494 if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence))
1472 { 1495 {