diff options
| author | Justin Clarke Casey | 2008-10-07 20:04:43 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-10-07 20:04:43 +0000 |
| commit | 914c7335056686b9f125b841d953d5952fdf9bb6 (patch) | |
| tree | 7ae75c1e7251fff0ac8143ce9e9fb812677b40fb /OpenSim | |
| parent | * Disabling mapitem requests for surrounding regions as it's probably using u... (diff) | |
| download | opensim-SC-914c7335056686b9f125b841d953d5952fdf9bb6.zip opensim-SC-914c7335056686b9f125b841d953d5952fdf9bb6.tar.gz opensim-SC-914c7335056686b9f125b841d953d5952fdf9bb6.tar.bz2 opensim-SC-914c7335056686b9f125b841d953d5952fdf9bb6.tar.xz | |
* 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.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | 14 |
1 files changed, 8 insertions, 6 deletions
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 | |||
| 53 | return (m_currentBitsSent < (m_currentThrottle/m_throttleTimeDivisor)); | 53 | return (m_currentBitsSent < (m_currentThrottle/m_throttleTimeDivisor)); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | public int AddBits(int bits) | 56 | // public int AddBits(int bits) |
| 57 | { | 57 | // { |
| 58 | m_currentBitsSent += bits; | 58 | // m_currentBitsSent += bits; |
| 59 | return m_currentBitsSent; | 59 | // return m_currentBitsSent; |
| 60 | } | 60 | // } |
| 61 | 61 | ||
| 62 | public int AddBytes(int bytes) | 62 | public int AddBytes(int bytes) |
| 63 | { | 63 | { |
| 64 | m_currentBitsSent += bytes * 8; | 64 | // XXX: Temporarily treat bytes as bits. This is a temporary revert of r6714 until other underlying issues |
| 65 | // are addressed. | ||
| 66 | m_currentBitsSent += bytes; | ||
| 65 | return m_currentBitsSent; | 67 | return m_currentBitsSent; |
| 66 | } | 68 | } |
| 67 | 69 | ||