From 892e7bf9fb57a313c71fbd687f44027bf90bbdda Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 5 Nov 2008 20:42:37 +0000 Subject: [PATCH] * Properly use the default value if the LindenUDP.ClientStack section exists by the client throttle setting does not * Old behaviour was to throw an exception on startup * Print out client stack setting temporarly for debug purposes --- OpenSim/Region/ClientStack/ClientStackUserSettings.cs | 5 ++--- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs index 31293d32e3..547fdc3e0f 100644 --- a/OpenSim/Region/ClientStack/ClientStackUserSettings.cs +++ b/OpenSim/Region/ClientStack/ClientStackUserSettings.cs @@ -41,9 +41,8 @@ namespace OpenSim.Region.ClientStack public ThrottleSettings TotalThrottleSettings; /// - /// A multiplier applied to all client throttle settings. This is hopefully a temporary setting to iron out - /// bugs that appear if the existing incorrect * 8 throttle (bytes instead of bits) is corrected. + /// A multiplier applied to all client throttle settings. Default value is x2 (temporarily) /// - public float ClientThrottleMultipler; + public float ClientThrottleMultipler = 2; } } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index f777e0e7a0..65e8b5f7c2 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -149,16 +149,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP AssetCache assetCache, AgentCircuitManager circuitManager) { ClientStackUserSettings userSettings = new ClientStackUserSettings(); - userSettings.ClientThrottleMultipler = 2; // default. TODO: Should be a constant somewhere IConfig config = configSource.Configs["ClientStack.LindenUDP"]; if (config != null) { - userSettings.ClientThrottleMultipler = config.GetFloat("client_throttle_multiplier"); + if (config.Contains("client_throttle_multiplier")) + userSettings.ClientThrottleMultipler = config.GetFloat("client_throttle_multiplier"); } - //m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler); + m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler); proxyPortOffset = proxyPortOffsetParm; listenPort = (uint) (port + proxyPortOffsetParm);