3 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 317d852..9aa27ec 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -127,7 +127,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             
             TotalThrottle 
                 = new LLPacketThrottle(
-                    totalThrottleSettings.Min, totalThrottleSettings.Max, totalThrottleSettings.Current, userSettings.ClientThrottleMultipler);
+                    totalThrottleSettings.Min, totalThrottleSettings.Max, totalThrottleSettings.Current,
+                    userSettings.ClientThrottleMultipler);
 
             throttleTimer = new Timer((int) (throttletimems/throttleTimeDivisor));
             throttleTimer.Elapsed += new ElapsedEventHandler(ThrottleTimerElapsed);
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
         private int m_currentBitsSent;
         
         /// <value>
-        /// Temporary field
+        /// Value with which to multiply all the throttle fields
         /// </value>
         private float m_throttleMultiplier;
 
@@ -47,8 +47,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="max"></param>
         /// <param name="throttle"></param>
         /// <param name="throttleMultiplier">
-        /// A temporary parameter that's ends up multiplying all throttle settings.  This only exists as a path to 
-        /// using real throttle values instead of the *8 multipler that we had been using (bytes instead of btis)
+        /// A parameter that's ends up multiplying all throttle settings.  An alternative solution would have been 
+        /// to multiply all the parameters by this before giving them to the constructor.  But doing it this way
+        /// represents the fact that the multiplier is a hack that pumps data to clients much faster than the actual
+        /// settings that we are given.
         /// </param>
         public LLPacketThrottle(int min, int max, int throttle, float throttleMultiplier)
         {
@@ -81,7 +83,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return m_currentBitsSent;
         }
 
-        // Properties
         public int Max
         {
             get { return m_maxAllowableThrottle; }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 1779d54..f777e0e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AssetCache assetCache, AgentCircuitManager circuitManager)
         {
             ClientStackUserSettings userSettings = new ClientStackUserSettings();
-            userSettings.ClientThrottleMultipler = 8;
+            userSettings.ClientThrottleMultipler = 2;  // default.  TODO: Should be a constant somewhere
             
             IConfig config = configSource.Configs["ClientStack.LindenUDP"];