diff options
author | Justin Clarke Casey | 2008-10-06 19:52:54 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-06 19:52:54 +0000 |
commit | cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a (patch) | |
tree | f4f8c4f3b849f35e4a4e56d05740ad19651d4a71 /OpenSim/Region/ClientStack/LindenUDP | |
parent | cleaning up OSHttpRequest removing old Http stuff. also adding test (diff) | |
download | opensim-SC-cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a.zip opensim-SC-cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a.tar.gz opensim-SC-cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a.tar.bz2 opensim-SC-cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a.tar.xz |
* Stop the sim stats reporter reusing the same SimStatsPacket for all clients
* I believe this was the cause of the remaining packet_out_of_order messages in the Linden client logs
* There were race conditions where multiple clientstacks would overwrite each other's sequence numbers
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ff35c32..cbba661 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2610,9 +2610,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2610 | OutPacket(PacketPool.Instance.GetPacket(PacketType.DisableSimulator), ThrottleOutPacketType.Unknown); | 2610 | OutPacket(PacketPool.Instance.GetPacket(PacketType.DisableSimulator), ThrottleOutPacketType.Unknown); |
2611 | } | 2611 | } |
2612 | 2612 | ||
2613 | public void SendSimStats(Packet pack) | 2613 | public void SendSimStats(SimStats stats) |
2614 | { | 2614 | { |
2615 | SimStatsPacket pack = new SimStatsPacket(); | ||
2616 | |||
2617 | pack.Region.RegionX = stats.RegionX; | ||
2618 | pack.Region.RegionY = stats.RegionY; | ||
2619 | pack.Region.RegionFlags = stats.RegionFlags; | ||
2620 | pack.Region.ObjectCapacity = stats.ObjectCapacity; | ||
2621 | pack.Region = stats.RegionBlock; | ||
2622 | pack.Stat = stats.StatsBlock; | ||
2623 | |||
2615 | pack.Header.Reliable = false; | 2624 | pack.Header.Reliable = false; |
2625 | |||
2616 | OutPacket(pack, ThrottleOutPacketType.Task); | 2626 | OutPacket(pack, ThrottleOutPacketType.Task); |
2617 | } | 2627 | } |
2618 | 2628 | ||