From 914c7335056686b9f125b841d953d5952fdf9bb6 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 7 Oct 2008 20:04:43 +0000 Subject: * Temporarily revert r6714 which changed agent throttle number interpretation * I suspect the restriction stopped the very large number of packet resends that occur on certain operations, which led to other failures. --- OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs index bfb3f6e..98b613e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs @@ -53,15 +53,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP return (m_currentBitsSent < (m_currentThrottle/m_throttleTimeDivisor)); } - public int AddBits(int bits) - { - m_currentBitsSent += bits; - return m_currentBitsSent; - } +// public int AddBits(int bits) +// { +// m_currentBitsSent += bits; +// return m_currentBitsSent; +// } public int AddBytes(int bytes) { - m_currentBitsSent += bytes * 8; + // XXX: Temporarily treat bytes as bits. This is a temporary revert of r6714 until other underlying issues + // are addressed. + m_currentBitsSent += bytes; return m_currentBitsSent; } -- cgit v1.1