aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
diff options
context:
space:
mode:
authorMelanie2012-11-20 01:21:15 +0000
committerMelanie2012-11-20 01:21:15 +0000
commitdecc5318a78cee5a8c18746363ab3b041d430289 (patch)
treee80b997dea1ac13d795ad9f22dfb02bc1a844b35 /OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
parentMerge commit 'e9153e1d1aae50024d8cd05fe14a9bce34343a0e' into careminster (diff)
parentMerge branch 'teravuswork' into avination (diff)
downloadopensim-SC-decc5318a78cee5a8c18746363ab3b041d430289.zip
opensim-SC-decc5318a78cee5a8c18746363ab3b041d430289.tar.gz
opensim-SC-decc5318a78cee5a8c18746363ab3b041d430289.tar.bz2
opensim-SC-decc5318a78cee5a8c18746363ab3b041d430289.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs4
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