diff options
-rw-r--r-- | OpenSim/Framework/ThrottleOutPacketType.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | 15 |
3 files changed, 3 insertions, 18 deletions
diff --git a/OpenSim/Framework/ThrottleOutPacketType.cs b/OpenSim/Framework/ThrottleOutPacketType.cs index d56231a..ca4b126 100644 --- a/OpenSim/Framework/ThrottleOutPacketType.cs +++ b/OpenSim/Framework/ThrottleOutPacketType.cs | |||
@@ -47,9 +47,6 @@ namespace OpenSim.Framework | |||
47 | Texture = 5, | 47 | Texture = 5, |
48 | /// <summary>Non-texture assets</summary> | 48 | /// <summary>Non-texture assets</summary> |
49 | Asset = 6, | 49 | Asset = 6, |
50 | /// <summary>Avatar and primitive data</summary> | ||
51 | /// <remarks>This is a sub-category of Task</remarks> | ||
52 | State = 7, | ||
53 | } | 50 | } |
54 | 51 | ||
55 | [Flags] | 52 | [Flags] |
@@ -61,6 +58,5 @@ namespace OpenSim.Framework | |||
61 | Task = 1 << 3, | 58 | Task = 1 << 3, |
62 | Texture = 1 << 4, | 59 | Texture = 1 << 4, |
63 | Asset = 1 << 5, | 60 | Asset = 1 << 5, |
64 | State = 1 << 6, | ||
65 | } | 61 | } |
66 | } | 62 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 0a865ab..3ae9daf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1607,7 +1607,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1607 | 1607 | ||
1608 | if (localIDs.Count == 1 && m_scene.GetScenePresence(localIDs[0]) != null) | 1608 | if (localIDs.Count == 1 && m_scene.GetScenePresence(localIDs[0]) != null) |
1609 | { | 1609 | { |
1610 | OutPacket(kill, ThrottleOutPacketType.State); | 1610 | OutPacket(kill, ThrottleOutPacketType.Task); |
1611 | } | 1611 | } |
1612 | else | 1612 | else |
1613 | { | 1613 | { |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index f675377..f1a1812 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
@@ -279,7 +279,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
279 | public string GetStats() | 279 | public string GetStats() |
280 | { | 280 | { |
281 | return string.Format( | 281 | return string.Format( |
282 | "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7} {12,7}", | 282 | "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}", |
283 | Util.EnvironmentTickCountSubtract(TickLastPacketReceived), | 283 | Util.EnvironmentTickCountSubtract(TickLastPacketReceived), |
284 | PacketsReceived, | 284 | PacketsReceived, |
285 | PacketsSent, | 285 | PacketsSent, |
@@ -291,8 +291,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
291 | m_packetOutboxes[(int)ThrottleOutPacketType.Cloud].Count, | 291 | m_packetOutboxes[(int)ThrottleOutPacketType.Cloud].Count, |
292 | m_packetOutboxes[(int)ThrottleOutPacketType.Task].Count, | 292 | m_packetOutboxes[(int)ThrottleOutPacketType.Task].Count, |
293 | m_packetOutboxes[(int)ThrottleOutPacketType.Texture].Count, | 293 | m_packetOutboxes[(int)ThrottleOutPacketType.Texture].Count, |
294 | m_packetOutboxes[(int)ThrottleOutPacketType.Asset].Count, | 294 | m_packetOutboxes[(int)ThrottleOutPacketType.Asset].Count); |
295 | m_packetOutboxes[(int)ThrottleOutPacketType.State].Count); | ||
296 | } | 295 | } |
297 | 296 | ||
298 | public void SendPacketStats() | 297 | public void SendPacketStats() |
@@ -338,8 +337,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
338 | int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; | 337 | int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; |
339 | int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; | 338 | int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; |
340 | int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); | 339 | int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); |
341 | // State is a subcategory of task that we allocate a percentage to | ||
342 | int state = 0; | ||
343 | 340 | ||
344 | // Make sure none of the throttles are set below our packet MTU, | 341 | // Make sure none of the throttles are set below our packet MTU, |
345 | // otherwise a throttle could become permanently clogged | 342 | // otherwise a throttle could become permanently clogged |
@@ -376,9 +373,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
376 | bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task]; | 373 | bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task]; |
377 | bucket.RequestedDripRate = task; | 374 | bucket.RequestedDripRate = task; |
378 | 375 | ||
379 | bucket = m_throttleCategories[(int)ThrottleOutPacketType.State]; | ||
380 | bucket.RequestedDripRate = state; | ||
381 | |||
382 | bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture]; | 376 | bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture]; |
383 | bucket.RequestedDripRate = texture; | 377 | bucket.RequestedDripRate = texture; |
384 | 378 | ||
@@ -709,9 +703,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
709 | Texture = 5, | 703 | Texture = 5, |
710 | /// <summary>Non-texture assets</summary> | 704 | /// <summary>Non-texture assets</summary> |
711 | Asset = 6, | 705 | Asset = 6, |
712 | /// <summary>Avatar and primitive data</summary> | ||
713 | /// <remarks>This is a sub-category of Task</remarks> | ||
714 | State = 7, | ||
715 | */ | 706 | */ |
716 | 707 | ||
717 | switch (category) | 708 | switch (category) |
@@ -728,8 +719,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
728 | return ThrottleOutPacketTypeFlags.Texture; | 719 | return ThrottleOutPacketTypeFlags.Texture; |
729 | case ThrottleOutPacketType.Asset: | 720 | case ThrottleOutPacketType.Asset: |
730 | return ThrottleOutPacketTypeFlags.Asset; | 721 | return ThrottleOutPacketTypeFlags.Asset; |
731 | case ThrottleOutPacketType.State: | ||
732 | return ThrottleOutPacketTypeFlags.State; | ||
733 | default: | 722 | default: |
734 | return 0; | 723 | return 0; |
735 | } | 724 | } |