1 files changed, 17 insertions, 8 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 1c398d9..6bfa864 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -69,18 +69,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         // This value also determines how many times per throttletimems the timer will run
         // If throttleimems is 1000 ms, then the timer will fire every 1000/7 milliseconds
 
+        private float throttleMultiplier = 2.0f; // Default value really doesn't matter.
         private int throttleTimeDivisor = 7;
 
         private int throttletimems = 1000;
 
-        private LLPacketThrottle ResendThrottle;
-        private LLPacketThrottle LandThrottle;
-        private LLPacketThrottle WindThrottle;
-        private LLPacketThrottle CloudThrottle;
-        private LLPacketThrottle TaskThrottle;
-        private LLPacketThrottle AssetThrottle;
-        private LLPacketThrottle TextureThrottle;
-        private LLPacketThrottle TotalThrottle;
+        internal LLPacketThrottle ResendThrottle;
+        internal LLPacketThrottle LandThrottle;
+        internal LLPacketThrottle WindThrottle;
+        internal LLPacketThrottle CloudThrottle;
+        internal LLPacketThrottle TaskThrottle;
+        internal LLPacketThrottle AssetThrottle;
+        internal LLPacketThrottle TextureThrottle;
+        internal LLPacketThrottle TotalThrottle;
 
         // private long LastThrottle;
         // private long ThrottleInterval;
@@ -108,6 +109,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             TextureOutgoingPacketQueue = new Queue<LLQueItem>();
             AssetOutgoingPacketQueue = new Queue<LLQueItem>();
 
+            // Store the throttle multiplier for posterity.
+            throttleMultiplier = userSettings.ClientThrottleMultipler;
+
             // Set up the throttle classes (min, max, current) in bits per second
             ResendThrottle =    new LLPacketThrottle(5000, 100000, 16000, userSettings.ClientThrottleMultipler);
             LandThrottle =      new LLPacketThrottle(1000, 100000, 2000, userSettings.ClientThrottleMultipler);
@@ -624,5 +628,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             return SendQueue.GetQueueArray();
         }
+
+        public float ThrottleMultiplier
+        {
+            get { return throttleMultiplier; }
+        }
     }
 }