aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-03 19:02:44 +0000
committerJustin Clarke Casey2008-11-03 19:02:44 +0000
commit8dbd0118a84fa065b675bedae3be802618cd1e9e (patch)
treee2c433f62a0080082455da726a7f1b5e7c18f102
parent* minor: don't need to null check config source in clientstack settings since... (diff)
downloadopensim-SC_OLD-8dbd0118a84fa065b675bedae3be802618cd1e9e.zip
opensim-SC_OLD-8dbd0118a84fa065b675bedae3be802618cd1e9e.tar.gz
opensim-SC_OLD-8dbd0118a84fa065b675bedae3be802618cd1e9e.tar.bz2
opensim-SC_OLD-8dbd0118a84fa065b675bedae3be802618cd1e9e.tar.xz
* Pull client throttle multipler setting out of config source. Not an adjustable setting yet (and then only for debug purposes)
-rw-r--r--OpenSim/Region/ClientStack/ClientStackUserSettings.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs11
2 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
index d34ae34..55ccdca 100644
--- a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
+++ b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs
@@ -39,5 +39,11 @@ namespace OpenSim.Region.ClientStack
39 /// The settings for the throttle that governs how many packets in total are sent to the client. 39 /// The settings for the throttle that governs how many packets in total are sent to the client.
40 /// </summary> 40 /// </summary>
41 public ThrottleSettings TotalThrottleSettings; 41 public ThrottleSettings TotalThrottleSettings;
42
43 /// <summary>
44 /// A multiplier applied to all client throttle settings. This is hopefully a temporary setting to iron out
45 /// bugs that appear if the existing incorrect * 8 throttle (bytes instead of bits) is corrected.
46 /// </summary>
47 public int ClientThrottleMultipler;
42 } 48 }
43} 49}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 960989d..72072c2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -148,8 +148,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
148 IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, 148 IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource,
149 AssetCache assetCache, AgentCircuitManager circuitManager) 149 AssetCache assetCache, AgentCircuitManager circuitManager)
150 { 150 {
151 // XXX Temporary until we start unpacking the config source
152 ClientStackUserSettings userSettings = new ClientStackUserSettings(); 151 ClientStackUserSettings userSettings = new ClientStackUserSettings();
152 userSettings.ClientThrottleMultipler = 8;
153
154 IConfig config = configSource.Configs["ClientStack.LindenUDP"];
155
156 if (config != null)
157 {
158 userSettings.ClientThrottleMultipler = config.GetInt("client_throttle_multiplier");
159 }
160
161 //m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler);
153 162
154 proxyPortOffset = proxyPortOffsetParm; 163 proxyPortOffset = proxyPortOffsetParm;
155 listenPort = (uint) (port + proxyPortOffsetParm); 164 listenPort = (uint) (port + proxyPortOffsetParm);