diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index 7c8e226672..4e9cf1ce39 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 if (maxRTO != 0) m_maxRTO = maxRTO; - m_burstTime = rates.BrustTime; + m_burstTime = rates.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 @@ -251,7 +251,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // Create an array of token buckets for this clients different throttle categories 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++) { @@ -262,7 +262,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // Initialize the token buckets that control the throttling for each category //m_throttleCategories[i] = new TokenBucket(m_throttleClient, rates.GetRate(type), m_burst); float rate = rates.GetRate(type); - float burst = rate * rates.BrustTime; + float burst = rate * rates.BurstTime; m_throttleCategories[i] = new TokenBucket(m_throttleClient, rate , burst); } diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs index 3277638697..707acdd7b4 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 public Int64 MinimumAdaptiveThrottleRate; public int ClientMaxRate; - public float BrustTime; + public float BurstTime; /// /// Default constructor @@ -94,8 +94,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (ClientMaxRate > 1000000) ClientMaxRate = 1000000; // no more than 8Mbps - BrustTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); - BrustTime *= 1e-3f; + BurstTime = (float)throttleConfig.GetInt("client_throttle_burtsTimeMS", 10); + BurstTime *= 1e-3f; // Adaptive is broken // AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false); diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml index 989984a31b..d01414b921 100644 --- a/bin/ScriptSyntax.xml +++ b/bin/ScriptSyntax.xml @@ -1,4 +1,4 @@ -e796a21f-5a66-e4ec-833f-c4896b8e87e4 +5b85f255-466f-238d-90ed-5726eaa2e67b llsd-lsl-syntax-version2 controls @@ -6754,15 +6754,15 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4 osKickAvatar arguments - FirstNametypestring - SurNametypestring + agentIdtypekey alerttypestring osKickAvatar arguments - agentIdtypekey + FirstNametypestring + SurNametypestring alerttypestring @@ -7351,6 +7351,7 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4 osSetProjectionParams arguments + primtypekey projectiontypeinteger texturetypekey fovtypefloat @@ -7361,7 +7362,17 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4 osSetProjectionParams arguments - primtypekey + projectiontypeinteger + texturetypekey + fovtypefloat + focustypefloat + ambtypefloat + + + osSetProjectionParams + + arguments + linknumbertypeinteger projectiontypeinteger texturetypekey fovtypefloat @@ -7595,7 +7606,8 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4 osTeleportOwner arguments - regionNametypestring + regionXtypeinteger + regionYtypeinteger positiontypevector lookattypevector @@ -7603,8 +7615,7 @@ e796a21f-5a66-e4ec-833f-c4896b8e87e4 osTeleportOwner arguments - regionXtypeinteger - regionYtypeinteger + regionNametypestring positiontypevector lookattypevector