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
         /// The settings for the throttle that governs how many packets in total are sent to the client.
         /// </summary>
         public ThrottleSettings TotalThrottleSettings;
+        
+        /// <summary>
+        /// 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.
+        /// </summary>
+        public int ClientThrottleMultipler;
     }
 }
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
             IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource,
             AssetCache assetCache, AgentCircuitManager circuitManager)
         {
-            // XXX Temporary until we start unpacking the config source
             ClientStackUserSettings userSettings = new ClientStackUserSettings();
+            userSettings.ClientThrottleMultipler = 8;
+            
+            IConfig config = configSource.Configs["ClientStack.LindenUDP"];
+            
+            if (config != null)
+            {
+                userSettings.ClientThrottleMultipler = config.GetInt("client_throttle_multiplier"); 
+            }   
+            
+            //m_log.DebugFormat("[CLIENT]: client_throttle_multiplier = {0}", userSettings.ClientThrottleMultipler);
                 
             proxyPortOffset = proxyPortOffsetParm;
             listenPort = (uint) (port + proxyPortOffsetParm);