diff options
Diffstat (limited to '')
3 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs index 4448b72..a476b91 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
105 | AdaptiveThrottlesEnabled = false; | 105 | AdaptiveThrottlesEnabled = false; |
106 | MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000); | 106 | MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000); |
107 | 107 | ||
108 | // http textures do use udp bandwith setting | 108 | // http textures do use udp bandwidth setting |
109 | // CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); | 109 | // CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); |
110 | // CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9); | 110 | // CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9); |
111 | CannibalizeTextureRate = 0f; | 111 | CannibalizeTextureRate = 0f; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index 7bd4fa7..1e26036 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | |||
@@ -365,8 +365,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
365 | /// </summary> | 365 | /// </summary> |
366 | protected object ConvertFromLSL(object lslparm, Type type, string fname) | 366 | protected object ConvertFromLSL(object lslparm, Type type, string fname) |
367 | { | 367 | { |
368 | |||
369 | if(lslparm.GetType() == type) | ||
370 | return lslparm; | ||
371 | |||
368 | // ---------- String ---------- | 372 | // ---------- String ---------- |
369 | if (lslparm is LSL_String) | 373 | else if (lslparm is LSL_String) |
370 | { | 374 | { |
371 | if (type == typeof(string)) | 375 | if (type == typeof(string)) |
372 | return (string)(LSL_String)lslparm; | 376 | return (string)(LSL_String)lslparm; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs index 20bbd72..fe2113b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs | |||
@@ -270,7 +270,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
270 | TestHelpers.InMethod(); | 270 | TestHelpers.InMethod(); |
271 | 271 | ||
272 | LSL_Types.Quaternion testValue = new LSL_Types.Quaternion(12.64, 59.43723, 765.3421, 4.00987); | 272 | LSL_Types.Quaternion testValue = new LSL_Types.Quaternion(12.64, 59.43723, 765.3421, 4.00987); |
273 | // make that nonesense a quartenion | 273 | // make that nonsense a quaternion |
274 | testValue.Normalize(); | 274 | testValue.Normalize(); |
275 | LSL_Types.list testList = new LSL_Types.list(testValue); | 275 | LSL_Types.list testList = new LSL_Types.list(testValue); |
276 | 276 | ||