diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 51eb396aa1..07c1e6779c 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -1014,22 +1014,22 @@ namespace OpenSim report.AppendFormat("{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "Type", ""); report.AppendFormat( - "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n", - "Packets", - "Packets", + "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n", + "Pkts", + "Pkts", "Bytes", - "Bytes", - "Bytes", - "Bytes", - "Bytes", - "Bytes", - "Bytes", - "Bytes", - "Bytes"); + "Pkts", + "Pkts", + "Pkts", + "Pkts", + "Pkts", + "Pkts", + "Pkts", + "Pkts"); report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); report.AppendFormat( - "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n", + "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n", "Out", "In", "Unacked", diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs index e02783ad4d..d4c33075eb 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs @@ -256,18 +256,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP public string GetStats() { return string.Format( - "{0,9} {1,9} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}", + "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}", PacketsSent, PacketsReceived, UnackedBytes, - m_throttleCategories[(int)ThrottleOutPacketType.Resend].Content, - m_throttleCategories[(int)ThrottleOutPacketType.Land].Content, - m_throttleCategories[(int)ThrottleOutPacketType.Wind].Content, - m_throttleCategories[(int)ThrottleOutPacketType.Cloud].Content, - m_throttleCategories[(int)ThrottleOutPacketType.Task].Content, - m_throttleCategories[(int)ThrottleOutPacketType.Texture].Content, - m_throttleCategories[(int)ThrottleOutPacketType.Asset].Content, - m_throttleCategories[(int)ThrottleOutPacketType.State].Content); + m_packetOutboxes[(int)ThrottleOutPacketType.Resend].Count, + m_packetOutboxes[(int)ThrottleOutPacketType.Land].Count, + m_packetOutboxes[(int)ThrottleOutPacketType.Wind].Count, + m_packetOutboxes[(int)ThrottleOutPacketType.Cloud].Count, + m_packetOutboxes[(int)ThrottleOutPacketType.Task].Count, + m_packetOutboxes[(int)ThrottleOutPacketType.Texture].Count, + m_packetOutboxes[(int)ThrottleOutPacketType.Asset].Count, + m_packetOutboxes[(int)ThrottleOutPacketType.State].Count); } public void SendPacketStats()