aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs6
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs6
-rw-r--r--bin/ScriptSyntax.xml27
3 files changed, 25 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 7c8e226..4e9cf1c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -242,7 +242,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
242 if (maxRTO != 0) 242 if (maxRTO != 0)
243 m_maxRTO = maxRTO; 243 m_maxRTO = maxRTO;
244 244
245 m_burstTime = rates.BrustTime; 245 m_burstTime = rates.BurstTime;
246 float m_burst = rates.ClientMaxRate * m_burstTime; 246 float m_burst = rates.ClientMaxRate * m_burstTime;
247 247
248 // Create a token bucket throttle for this client that has the scene token bucket as a parent 248 // Create a token bucket throttle for this client that has the scene token bucket as a parent
@@ -251,7 +251,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
251 // Create an array of token buckets for this clients different throttle categories 251 // Create an array of token buckets for this clients different throttle categories
252 m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT]; 252 m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];
253 253
254 m_burst = rates.Total * rates.BrustTime; 254 m_burst = rates.Total * rates.BurstTime;
255 255
256 for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) 256 for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
257 { 257 {
@@ -262,7 +262,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
262 // Initialize the token buckets that control the throttling for each category 262 // Initialize the token buckets that control the throttling for each category
263 //m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst); 263 //m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst);
264 float rate = rates.GetRate(type); 264 float rate = rates.GetRate(type);
265 float burst = rate * rates.BrustTime; 265 float burst = rate * rates.BurstTime;
266 m_throttleCategories[i] = new TokenBucket(m_throttleClient, rate , burst); 266 m_throttleCategories[i] = new TokenBucket(m_throttleClient, rate , burst);
267 } 267 }
268 268
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
index 3277638..707acdd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
67 public Int64 MinimumAdaptiveThrottleRate; 67 public Int64 MinimumAdaptiveThrottleRate;
68 68
69 public int ClientMaxRate; 69 public int ClientMaxRate;
70 public float BrustTime; 70 public float BurstTime;
71 71
72 /// <summary> 72 /// <summary>
73 /// Default constructor 73 /// Default constructor
@@ -94,8 +94,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
94 if (ClientMaxRate > 1000000) 94 if (ClientMaxRate > 1000000)
95 ClientMaxRate = 1000000; // no more than 8Mbps 95 ClientMaxRate = 1000000; // no more than 8Mbps
96 96
97 BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); 97 BurstTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10);
98 BrustTime *= 1e-3f; 98 BurstTime *= 1e-3f;
99 99
100 // Adaptive is broken 100 // Adaptive is broken
101// AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); 101// AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false);
diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml
index 989984a..d01414b 100644
--- a/bin/ScriptSyntax.xml
+++ b/bin/ScriptSyntax.xml
@@ -1,4 +1,4 @@
1e796a21f-5a66-e4ec-833f-c4896b8e87e4 15b85f255-466f-238d-90ed-5726eaa2e67b
2<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer> 2<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
3<key>controls</key> 3<key>controls</key>
4<map> 4<map>
@@ -6754,15 +6754,15 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
6754 <key>osKickAvatar</key> 6754 <key>osKickAvatar</key>
6755 <map> 6755 <map>
6756 <key>arguments</key><array> 6756 <key>arguments</key><array>
6757 <map><key>FirstName</key><map><key>type</key><string>string</string></map></map> 6757 <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
6758 <map><key>SurName</key><map><key>type</key><string>string</string></map></map>
6759 <map><key>alert</key><map><key>type</key><string>string</string></map></map> 6758 <map><key>alert</key><map><key>type</key><string>string</string></map></map>
6760 </array> 6759 </array>
6761 </map> 6760 </map>
6762 <key>osKickAvatar</key> 6761 <key>osKickAvatar</key>
6763 <map> 6762 <map>
6764 <key>arguments</key><array> 6763 <key>arguments</key><array>
6765 <map><key>agentId</key><map><key>type</key><string>key</string></map></map> 6764 <map><key>FirstName</key><map><key>type</key><string>string</string></map></map>
6765 <map><key>SurName</key><map><key>type</key><string>string</string></map></map>
6766 <map><key>alert</key><map><key>type</key><string>string</string></map></map> 6766 <map><key>alert</key><map><key>type</key><string>string</string></map></map>
6767 </array> 6767 </array>
6768 </map> 6768 </map>
@@ -7351,6 +7351,7 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
7351 <key>osSetProjectionParams</key> 7351 <key>osSetProjectionParams</key>
7352 <map> 7352 <map>
7353 <key>arguments</key><array> 7353 <key>arguments</key><array>
7354 <map><key>prim</key><map><key>type</key><string>key</string></map></map>
7354 <map><key>projection</key><map><key>type</key><string>integer</string></map></map> 7355 <map><key>projection</key><map><key>type</key><string>integer</string></map></map>
7355 <map><key>texture</key><map><key>type</key><string>key</string></map></map> 7356 <map><key>texture</key><map><key>type</key><string>key</string></map></map>
7356 <map><key>fov</key><map><key>type</key><string>float</string></map></map> 7357 <map><key>fov</key><map><key>type</key><string>float</string></map></map>
@@ -7361,7 +7362,17 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
7361 <key>osSetProjectionParams</key> 7362 <key>osSetProjectionParams</key>
7362 <map> 7363 <map>
7363 <key>arguments</key><array> 7364 <key>arguments</key><array>
7364 <map><key>prim</key><map><key>type</key><string>key</string></map></map> 7365 <map><key>projection</key><map><key>type</key><string>integer</string></map></map>
7366 <map><key>texture</key><map><key>type</key><string>key</string></map></map>
7367 <map><key>fov</key><map><key>type</key><string>float</string></map></map>
7368 <map><key>focus</key><map><key>type</key><string>float</string></map></map>
7369 <map><key>amb</key><map><key>type</key><string>float</string></map></map>
7370 </array>
7371 </map>
7372 <key>osSetProjectionParams</key>
7373 <map>
7374 <key>arguments</key><array>
7375 <map><key>linknumber</key><map><key>type</key><string>integer</string></map></map>
7365 <map><key>projection</key><map><key>type</key><string>integer</string></map></map> 7376 <map><key>projection</key><map><key>type</key><string>integer</string></map></map>
7366 <map><key>texture</key><map><key>type</key><string>key</string></map></map> 7377 <map><key>texture</key><map><key>type</key><string>key</string></map></map>
7367 <map><key>fov</key><map><key>type</key><string>float</string></map></map> 7378 <map><key>fov</key><map><key>type</key><string>float</string></map></map>
@@ -7595,7 +7606,8 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
7595 <key>osTeleportOwner</key> 7606 <key>osTeleportOwner</key>
7596 <map> 7607 <map>
7597 <key>arguments</key><array> 7608 <key>arguments</key><array>
7598 <map><key>regionName</key><map><key>type</key><string>string</string></map></map> 7609 <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
7610 <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
7599 <map><key>position</key><map><key>type</key><string>vector</string></map></map> 7611 <map><key>position</key><map><key>type</key><string>vector</string></map></map>
7600 <map><key>lookat</key><map><key>type</key><string>vector</string></map></map> 7612 <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
7601 </array> 7613 </array>
@@ -7603,8 +7615,7 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
7603 <key>osTeleportOwner</key> 7615 <key>osTeleportOwner</key>
7604 <map> 7616 <map>
7605 <key>arguments</key><array> 7617 <key>arguments</key><array>
7606 <map><key>regionX</key><map><key>type</key><string>integer</string></map></map> 7618 <map><key>regionName</key><map><key>type</key><string>string</string></map></map>
7607 <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
7608 <map><key>position</key><map><key>type</key><string>vector</string></map></map> 7619 <map><key>position</key><map><key>type</key><string>vector</string></map></map>
7609 <map><key>lookat</key><map><key>type</key><string>vector</string></map></map> 7620 <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
7610 </array> 7621 </array>
generated by cgit v1.1 at 2025-01-11 01:23:03 +0000