OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

old typo

0.9.1.0-post-fixes
UbitUmarov 2019-04-23 14:52:15 +01:00
parent 5314f375c5
commit 8994045d5f
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
View File

@ -242,7 +242,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (maxRTO != 0) if (maxRTO != 0)
m_maxRTO = maxRTO; m_maxRTO = maxRTO;
m_burstTime = rates.BrustTime; m_burstTime = rates.BurstTime;
float m_burst = rates.ClientMaxRate * m_burstTime; float m_burst = rates.ClientMaxRate * m_burstTime;
// Create a token bucket throttle for this client that has the scene token bucket as a parent // 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
// Create an array of token buckets for this clients different throttle categories // Create an array of token buckets for this clients different throttle categories
m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT]; m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];
m_burst = rates.Total * rates.BrustTime; m_burst = rates.Total * rates.BurstTime;
for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
{ {
@ -262,7 +262,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Initialize the token buckets that control the throttling for each category // Initialize the token buckets that control the throttling for each category
//m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst); //m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst);
float rate = rates.GetRate(type); float rate = rates.GetRate(type);
float burst = rate * rates.BrustTime; float burst = rate * rates.BurstTime;
m_throttleCategories[i] = new TokenBucket(m_throttleClient, rate , burst); m_throttleCategories[i] = new TokenBucket(m_throttleClient, rate , burst);
} }

6
OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
View File

@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public Int64 MinimumAdaptiveThrottleRate; public Int64 MinimumAdaptiveThrottleRate;
public int ClientMaxRate; public int ClientMaxRate;
public float BrustTime; public float BurstTime;
/// <summary> /// <summary>
/// Default constructor /// Default constructor
@ -94,8 +94,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (ClientMaxRate > 1000000) if (ClientMaxRate > 1000000)
ClientMaxRate = 1000000; // no more than 8Mbps ClientMaxRate = 1000000; // no more than 8Mbps
BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); BurstTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10);
BrustTime *= 1e-3f; BurstTime *= 1e-3f;
// Adaptive is broken // Adaptive is broken
// AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); // AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false);

27
bin/ScriptSyntax.xml
View File

@ -1,4 +1,4 @@
e796a21f-5a66-e4ec-833f-c4896b8e87e4 5b85f255-466f-238d-90ed-5726eaa2e67b
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer> <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
<key>controls</key> <key>controls</key>
<map> <map>
@ -6754,15 +6754,15 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
<key>osKickAvatar</key> <key>osKickAvatar</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>FirstName</key><map><key>type</key><string>string</string></map></map> <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
<map><key>SurName</key><map><key>type</key><string>string</string></map></map>
<map><key>alert</key><map><key>type</key><string>string</string></map></map> <map><key>alert</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
<key>osKickAvatar</key> <key>osKickAvatar</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>agentId</key><map><key>type</key><string>key</string></map></map> <map><key>FirstName</key><map><key>type</key><string>string</string></map></map>
<map><key>SurName</key><map><key>type</key><string>string</string></map></map>
<map><key>alert</key><map><key>type</key><string>string</string></map></map> <map><key>alert</key><map><key>type</key><string>string</string></map></map>
</array> </array>
</map> </map>
@ -7351,6 +7351,7 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
<key>osSetProjectionParams</key> <key>osSetProjectionParams</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>prim</key><map><key>type</key><string>key</string></map></map>
<map><key>projection</key><map><key>type</key><string>integer</string></map></map> <map><key>projection</key><map><key>type</key><string>integer</string></map></map>
<map><key>texture</key><map><key>type</key><string>key</string></map></map> <map><key>texture</key><map><key>type</key><string>key</string></map></map>
<map><key>fov</key><map><key>type</key><string>float</string></map></map> <map><key>fov</key><map><key>type</key><string>float</string></map></map>
@ -7361,7 +7362,17 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
<key>osSetProjectionParams</key> <key>osSetProjectionParams</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>prim</key><map><key>type</key><string>key</string></map></map> <map><key>projection</key><map><key>type</key><string>integer</string></map></map>
<map><key>texture</key><map><key>type</key><string>key</string></map></map>
<map><key>fov</key><map><key>type</key><string>float</string></map></map>
<map><key>focus</key><map><key>type</key><string>float</string></map></map>
<map><key>amb</key><map><key>type</key><string>float</string></map></map>
</array>
</map>
<key>osSetProjectionParams</key>
<map>
<key>arguments</key><array>
<map><key>linknumber</key><map><key>type</key><string>integer</string></map></map>
<map><key>projection</key><map><key>type</key><string>integer</string></map></map> <map><key>projection</key><map><key>type</key><string>integer</string></map></map>
<map><key>texture</key><map><key>type</key><string>key</string></map></map> <map><key>texture</key><map><key>type</key><string>key</string></map></map>
<map><key>fov</key><map><key>type</key><string>float</string></map></map> <map><key>fov</key><map><key>type</key><string>float</string></map></map>
@ -7595,7 +7606,8 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
<key>osTeleportOwner</key> <key>osTeleportOwner</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>regionName</key><map><key>type</key><string>string</string></map></map> <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
<map><key>position</key><map><key>type</key><string>vector</string></map></map> <map><key>position</key><map><key>type</key><string>vector</string></map></map>
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map> <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
</array> </array>
@ -7603,8 +7615,7 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4
<key>osTeleportOwner</key> <key>osTeleportOwner</key>
<map> <map>
<key>arguments</key><array> <key>arguments</key><array>
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map> <map><key>regionName</key><map><key>type</key><string>string</string></map></map>
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
<map><key>position</key><map><key>type</key><string>vector</string></map></map> <map><key>position</key><map><key>type</key><string>vector</string></map></map>
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map> <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
</array> </array>