aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorUbitUmarov2016-11-05 20:14:11 +0000
committerUbitUmarov2016-11-05 20:14:11 +0000
commit8cc8d15f950657d4d021fc81d14a8715007e7bb4 (patch)
tree34444f63972e9c1b04c7a1dddee3807bd290b809 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parent disable bad/broken throttle options (diff)
downloadopensim-SC-8cc8d15f950657d4d021fc81d14a8715007e7bb4.zip
opensim-SC-8cc8d15f950657d4d021fc81d14a8715007e7bb4.tar.gz
opensim-SC-8cc8d15f950657d4d021fc81d14a8715007e7bb4.tar.bz2
opensim-SC-8cc8d15f950657d4d021fc81d14a8715007e7bb4.tar.xz
some types may already be native in MOD_Api ConvertFromLSL
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs6
1 files changed, 5 insertions, 1 deletions
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;