diff options
author | teravus | 2012-11-17 03:47:09 -0500 |
---|---|---|
committer | teravus | 2012-11-17 03:47:09 -0500 |
commit | 5e0294815f7e3ec83b7e568e1468948ac0ff7331 (patch) | |
tree | d6a436877fd6df204bbe99f22d896947d58f5aed /OpenSim/Region/ClientStack/Linden/UDP | |
parent | Revert "Merge master into teravuswork", it should have been avination, not ma... (diff) | |
download | opensim-SC-5e0294815f7e3ec83b7e568e1468948ac0ff7331.zip opensim-SC-5e0294815f7e3ec83b7e568e1468948ac0ff7331.tar.gz opensim-SC-5e0294815f7e3ec83b7e568e1468948ac0ff7331.tar.bz2 opensim-SC-5e0294815f7e3ec83b7e568e1468948ac0ff7331.tar.xz |
* Plumbing and basic setting of the GetMesh Cap Throttler.
* Last step is to flip the throttle distribution.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index ae9ed7f..533a1a8 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -11884,6 +11884,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11884 | } | 11884 | } |
11885 | 11885 | ||
11886 | /// <summary> | 11886 | /// <summary> |
11887 | /// Sets the throttles from values supplied by the client | ||
11888 | /// </summary> | ||
11889 | /// <param name="throttles"></param> | ||
11890 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
11891 | { | ||
11892 | m_udpClient.ForceThrottleSetting(throttle,setting); | ||
11893 | //m_udpClient.SetThrottles(throttles); | ||
11894 | |||
11895 | } | ||
11896 | |||
11897 | |||
11898 | /// <summary> | ||
11887 | /// Get the current throttles for this client as a packed byte array | 11899 | /// Get the current throttles for this client as a packed byte array |
11888 | /// </summary> | 11900 | /// </summary> |
11889 | /// <param name="multiplier">Unused</param> | 11901 | /// <param name="multiplier">Unused</param> |
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 |