diff options
| author | Melanie | 2012-11-20 00:48:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-11-20 00:48:13 +0100 |
| commit | 0bf66434bc87694c7a19b899afd9b068c67f3bec (patch) | |
| tree | 5c373252d92103dbd7c8376ef8ebd5e7ff8cecc9 /OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |
| parent | Prevent a buffer overflow in asset receiving (diff) | |
| parent | * Plumbing and basic setting of the GetMesh Cap Throttler. (diff) | |
| download | opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.zip opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.gz opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.bz2 opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.xz | |
Merge branch 'teravuswork' into avination
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index c472176..f675377 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
| @@ -682,6 +682,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 682 | if (m_nextOnQueueEmpty == 0) | 682 | if (m_nextOnQueueEmpty == 0) |
| 683 | m_nextOnQueueEmpty = 1; | 683 | m_nextOnQueueEmpty = 1; |
| 684 | } | 684 | } |
| 685 | internal void ForceThrottleSetting(int throttle, int setting) | ||
| 686 | { | ||
| 687 | m_throttleCategories[throttle].RequestedDripRate = Math.Max(setting, LLUDPServer.MTU); ; | ||
| 688 | } | ||
| 685 | 689 | ||
| 686 | /// <summary> | 690 | /// <summary> |
| 687 | /// Converts a <seealso cref="ThrottleOutPacketType"/> integer to a | 691 | /// Converts a <seealso cref="ThrottleOutPacketType"/> integer to a |