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

some types may already be native in MOD_Api ConvertFromLSL

melanie
UbitUmarov 2016-11-05 20:14:11 +00:00
parent 22d20dbf17
commit 8cc8d15f95
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AdaptiveThrottlesEnabled = false; AdaptiveThrottlesEnabled = false;
MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000); MinimumAdaptiveThrottleRate = throttleConfig.GetInt("adaptive_throttle_min_bps", 32000);
// http textures do use udp bandwith setting // http textures do use udp bandwidth setting
// CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f); // CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f);
// CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9); // CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9);
CannibalizeTextureRate = 0f; CannibalizeTextureRate = 0f;

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
View File

@ -365,8 +365,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// </summary> /// </summary>
protected object ConvertFromLSL(object lslparm, Type type, string fname) protected object ConvertFromLSL(object lslparm, Type type, string fname)
{ {
if(lslparm.GetType() == type)
return lslparm;
// ---------- String ---------- // ---------- String ----------
if (lslparm is LSL_String) else if (lslparm is LSL_String)
{ {
if (type == typeof(string)) if (type == typeof(string))
return (string)(LSL_String)lslparm; return (string)(LSL_String)lslparm;

2
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
View File

@ -270,7 +270,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
TestHelpers.InMethod(); TestHelpers.InMethod();
LSL_Types.Quaternion testValue = new LSL_Types.Quaternion(12.64, 59.43723, 765.3421, 4.00987); LSL_Types.Quaternion testValue = new LSL_Types.Quaternion(12.64, 59.43723, 765.3421, 4.00987);
// make that nonesense a quartenion // make that nonsense a quaternion
testValue.Normalize(); testValue.Normalize();
LSL_Types.list testList = new LSL_Types.list(testValue); LSL_Types.list testList = new LSL_Types.list(testValue);