aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/ClientStackUserSettings.cs5
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs6
2 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
index 31293d3..547fdc3 100644
--- a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
+++ b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
@@ -41,9 +41,8 @@ namespace OpenSim.Region.ClientStack
41 public ThrottleSettings TotalThrottleSettings; 41 public ThrottleSettings TotalThrottleSettings;
42 42
43 /// <summary> 43 /// <summary>
44 /// A multiplier applied to all client throttle settings. This is hopefully a temporary setting to iron out 44 /// A multiplier applied to all client throttle settings. Default value is x2 (temporarily)
45 /// bugs that appear if the existing incorrect * 8 throttle (bytes instead of bits) is corrected.
46 /// </summary> 45 /// </summary>
47 public float ClientThrottleMultipler; 46 public float ClientThrottleMultipler = 2;
48 } 47 }
49} 48}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index f777e0e..65e8b5f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -149,16 +149,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
149 AssetCache assetCache, AgentCircuitManager circuitManager) 149 AssetCache assetCache, AgentCircuitManager circuitManager)
150 { 150 {
151 ClientStackUserSettings userSettings = new ClientStackUserSettings(); 151 ClientStackUserSettings userSettings = new ClientStackUserSettings();
152 userSettings.ClientThrottleMultipler = 2; // default. TODO: Should be a constant somewhere
153 152
154 IConfig config = configSource.Configs["ClientStack.LindenUDP"]; 153 IConfig config = configSource.Configs["ClientStack.LindenUDP"];
155 154
156 if (config != null) 155 if (config != null)
157 { 156 {
158 userSettings.ClientThrottleMultipler = config.GetFloat("client_throttle_multiplier"); 157 if (config.Contains("client_throttle_multiplier"))
158 userSettings.ClientThrottleMultipler = config.GetFloat("client_throttle_multiplier");
159 } 159 }
160 160
161 //m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler); 161 m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler);
162 162
163 proxyPortOffset = proxyPortOffsetParm; 163 proxyPortOffset = proxyPortOffsetParm;
164 listenPort = (uint) (port + proxyPortOffsetParm); 164 listenPort = (uint) (port + proxyPortOffsetParm);