1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 9abde5d..317d852 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -110,13 +110,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            AssetOutgoingPacketQueue = new Queue<LLQueItem>();
            // Set up the throttle classes (min, max, current) in bits per second
-            ResendThrottle = new LLPacketThrottle(5000, 100000, 16000);
+            ResendThrottle =    new LLPacketThrottle(5000, 100000, 16000, userSettings.ClientThrottleMultipler);
-            LandThrottle = new LLPacketThrottle(1000, 100000, 2000);
+            LandThrottle =      new LLPacketThrottle(1000, 100000, 2000, userSettings.ClientThrottleMultipler);
-            WindThrottle = new LLPacketThrottle(0, 100000, 0);
+            WindThrottle =      new LLPacketThrottle(0, 100000, 0, userSettings.ClientThrottleMultipler);
-            CloudThrottle = new LLPacketThrottle(0, 100000, 0);
+            CloudThrottle =     new LLPacketThrottle(0, 100000, 0, userSettings.ClientThrottleMultipler);
-            TaskThrottle = new LLPacketThrottle(1000, 800000, 3000);
+            TaskThrottle =      new LLPacketThrottle(1000, 800000, 3000, userSettings.ClientThrottleMultipler);
-            AssetThrottle = new LLPacketThrottle(1000, 800000, 1000);
+            AssetThrottle =     new LLPacketThrottle(1000, 800000, 1000, userSettings.ClientThrottleMultipler);
-            TextureThrottle = new LLPacketThrottle(1000, 800000, 4000);
+            TextureThrottle =   new LLPacketThrottle(1000, 800000, 4000, userSettings.ClientThrottleMultipler);
            
            // Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second.            
            ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings;
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            
            TotalThrottle 
                = new LLPacketThrottle(
-                    totalThrottleSettings.Min, totalThrottleSettings.Max, totalThrottleSettings.Current);
+                    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/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 9abde5d..317d852 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -110,13 +110,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
110	AssetOutgoingPacketQueue = new Queue<LLQueItem>();	110	AssetOutgoingPacketQueue = new Queue<LLQueItem>();
111		111
112	// Set up the throttle classes (min, max, current) in bits per second	112	// Set up the throttle classes (min, max, current) in bits per second
113	ResendThrottle = new LLPacketThrottle(5000, 100000, 16000);	113	ResendThrottle = new LLPacketThrottle(5000, 100000, 16000, userSettings.ClientThrottleMultipler);
114	LandThrottle = new LLPacketThrottle(1000, 100000, 2000);	114	LandThrottle = new LLPacketThrottle(1000, 100000, 2000, userSettings.ClientThrottleMultipler);
115	WindThrottle = new LLPacketThrottle(0, 100000, 0);	115	WindThrottle = new LLPacketThrottle(0, 100000, 0, userSettings.ClientThrottleMultipler);
116	CloudThrottle = new LLPacketThrottle(0, 100000, 0);	116	CloudThrottle = new LLPacketThrottle(0, 100000, 0, userSettings.ClientThrottleMultipler);
117	TaskThrottle = new LLPacketThrottle(1000, 800000, 3000);	117	TaskThrottle = new LLPacketThrottle(1000, 800000, 3000, userSettings.ClientThrottleMultipler);
118	AssetThrottle = new LLPacketThrottle(1000, 800000, 1000);	118	AssetThrottle = new LLPacketThrottle(1000, 800000, 1000, userSettings.ClientThrottleMultipler);
119	TextureThrottle = new LLPacketThrottle(1000, 800000, 4000);	119	TextureThrottle = new LLPacketThrottle(1000, 800000, 4000, userSettings.ClientThrottleMultipler);
120		120
121	// Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second.	121	// Total Throttle trumps all - it is the number of bits in total that are allowed to go out per second.
122	ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings;	122	ThrottleSettings totalThrottleSettings = userSettings.TotalThrottleSettings;
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
127		127
128	TotalThrottle	128	TotalThrottle
129	= new LLPacketThrottle(	129	= new LLPacketThrottle(
130	totalThrottleSettings.Min, totalThrottleSettings.Max, totalThrottleSettings.Current);	130	totalThrottleSettings.Min, totalThrottleSettings.Max, totalThrottleSettings.Current, userSettings.ClientThrottleMultipler);
131		131
132	throttleTimer = new Timer((int) (throttletimems/throttleTimeDivisor));	132	throttleTimer = new Timer((int) (throttletimems/throttleTimeDivisor));
133	throttleTimer.Elapsed += new ElapsedEventHandler(ThrottleTimerElapsed);	133	throttleTimer.Elapsed += new ElapsedEventHandler(ThrottleTimerElapsed);