diff options
| author | Justin Clark-Casey (justincc) | 2014-10-25 02:09:37 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-11-25 23:22:20 +0000 |
| commit | b2e377f168967f7cedb32f077ee54b9f92439205 (patch) | |
| tree | e6904f3c5a57a0334dd59c4164826c6dda0e1f69 /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |
| parent | Add request drip rate to assertions for token bucket regression tests (diff) | |
| download | opensim-SC_OLD-b2e377f168967f7cedb32f077ee54b9f92439205.zip opensim-SC_OLD-b2e377f168967f7cedb32f077ee54b9f92439205.tar.gz opensim-SC_OLD-b2e377f168967f7cedb32f077ee54b9f92439205.tar.bz2 opensim-SC_OLD-b2e377f168967f7cedb32f077ee54b9f92439205.tar.xz | |
Fix setting of max scene throttle so that setting it restricts the child client throttles properly.
In "show throttles", also renames 'total' column to 'actual' to reflect that it is not necessarily the throttles requested for/by the client.
Also fills out 'target' in non-adapative mode to the actual throttle requested for/by the client.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 415a22e..aa10301 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
| @@ -447,7 +447,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 447 | // = new TokenBucket( | 447 | // = new TokenBucket( |
| 448 | // string.Format("server throttle bucket for {0}", Scene.Name), null, sceneThrottleBps); | 448 | // string.Format("server throttle bucket for {0}", Scene.Name), null, sceneThrottleBps); |
| 449 | 449 | ||
| 450 | Throttle = new TokenBucket("server throttle bucket", null, sceneThrottleBps, sceneThrottleBps); | 450 | Throttle = new TokenBucket("server throttle bucket", null, 0, sceneThrottleBps); |
| 451 | 451 | ||
| 452 | ThrottleRates = new ThrottleRates(configSource); | 452 | ThrottleRates = new ThrottleRates(configSource); |
| 453 | 453 | ||