diff options
| author | Diva Canto | 2014-12-30 20:05:33 -0800 |
|---|---|---|
| committer | Diva Canto | 2014-12-30 20:05:33 -0800 |
| commit | 0af02efaed2e42f128f585b960550b0b8896c54f (patch) | |
| tree | 886803e85dd278a62f9e42f3eca92d49bf785028 /OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |
| parent | Add support for expansion of key values in nini config files. (diff) | |
| parent | Merge branch 'mb-throttle-test' (diff) | |
| download | opensim-SC_OLD-0af02efaed2e42f128f585b960550b0b8896c54f.zip opensim-SC_OLD-0af02efaed2e42f128f585b960550b0b8896c54f.tar.gz opensim-SC_OLD-0af02efaed2e42f128f585b960550b0b8896c54f.tar.bz2 opensim-SC_OLD-0af02efaed2e42f128f585b960550b0b8896c54f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index 8f14806..de91856 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
| @@ -229,7 +229,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 229 | m_throttleClient | 229 | m_throttleClient |
| 230 | = new AdaptiveTokenBucket( | 230 | = new AdaptiveTokenBucket( |
| 231 | string.Format("adaptive throttle for {0} in {1}", AgentID, server.Scene.Name), | 231 | string.Format("adaptive throttle for {0} in {1}", AgentID, server.Scene.Name), |
| 232 | parentThrottle, 0, rates.Total, rates.AdaptiveThrottlesEnabled); | 232 | parentThrottle, 0, rates.Total, rates.MinimumAdaptiveThrottleRate, rates.AdaptiveThrottlesEnabled); |
| 233 | 233 | ||
| 234 | // Create an array of token buckets for this clients different throttle categories | 234 | // Create an array of token buckets for this clients different throttle categories |
| 235 | m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT]; | 235 | m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT]; |