diff options
author | Justin Clarke Casey | 2008-11-05 19:23:59 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-05 19:23:59 +0000 |
commit | fc36d7fdf2bf012e6ac60f62875a4a5973af4970 (patch) | |
tree | 460b98adcd43e3983ab32f82518a2b5ee1d9577c /OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | |
parent | Moved a couple of more configuration fields to ConfigSettings (diff) | |
download | opensim-SC_OLD-fc36d7fdf2bf012e6ac60f62875a4a5973af4970.zip opensim-SC_OLD-fc36d7fdf2bf012e6ac60f62875a4a5973af4970.tar.gz opensim-SC_OLD-fc36d7fdf2bf012e6ac60f62875a4a5973af4970.tar.bz2 opensim-SC_OLD-fc36d7fdf2bf012e6ac60f62875a4a5973af4970.tar.xz |
* Set default client throttle multiplier to 2 (old value was effectively 8). See OpenSim.ini.example for details as to what this means
* Really this should be 1, but I think that this would be too slow compared to a Second Life server until we improve our ability to send textures of variable quality
* This may improve one aspect of sim performance where there are many avatars. However, there are still other performance problems that are unrelated to this change
* Value may be further tuned
* Removed temporary decals since the multipler setting will stick around now
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs index 2c67d63..305a984 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
36 | private int m_currentBitsSent; | 36 | private int m_currentBitsSent; |
37 | 37 | ||
38 | /// <value> | 38 | /// <value> |
39 | /// Temporary field | 39 | /// Value with which to multiply all the throttle fields |
40 | /// </value> | 40 | /// </value> |
41 | private float m_throttleMultiplier; | 41 | private float m_throttleMultiplier; |
42 | 42 | ||
@@ -47,8 +47,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
47 | /// <param name="max"></param> | 47 | /// <param name="max"></param> |
48 | /// <param name="throttle"></param> | 48 | /// <param name="throttle"></param> |
49 | /// <param name="throttleMultiplier"> | 49 | /// <param name="throttleMultiplier"> |
50 | /// A temporary parameter that's ends up multiplying all throttle settings. This only exists as a path to | 50 | /// A parameter that's ends up multiplying all throttle settings. An alternative solution would have been |
51 | /// using real throttle values instead of the *8 multipler that we had been using (bytes instead of btis) | 51 | /// to multiply all the parameters by this before giving them to the constructor. But doing it this way |
52 | /// represents the fact that the multiplier is a hack that pumps data to clients much faster than the actual | ||
53 | /// settings that we are given. | ||
52 | /// </param> | 54 | /// </param> |
53 | public LLPacketThrottle(int min, int max, int throttle, float throttleMultiplier) | 55 | public LLPacketThrottle(int min, int max, int throttle, float throttleMultiplier) |
54 | { | 56 | { |
@@ -81,7 +83,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
81 | return m_currentBitsSent; | 83 | return m_currentBitsSent; |
82 | } | 84 | } |
83 | 85 | ||
84 | // Properties | ||
85 | public int Max | 86 | public int Max |
86 | { | 87 | { |
87 | get { return m_maxAllowableThrottle; } | 88 | get { return m_maxAllowableThrottle; } |