diff options
author | UbitUmarov | 2016-11-07 11:36:43 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-07 11:36:43 +0000 |
commit | 93ea7bd7f470a7fd80b6400d39091ffb1780fbd9 (patch) | |
tree | f00524dd18c7d865b2a8a755b4ce1284ff005de3 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | |
parent | Merge branch 'master' into httptests (diff) | |
parent | add a few more lsl constants for attachments (diff) | |
download | opensim-SC-93ea7bd7f470a7fd80b6400d39091ffb1780fbd9.zip opensim-SC-93ea7bd7f470a7fd80b6400d39091ffb1780fbd9.tar.gz opensim-SC-93ea7bd7f470a7fd80b6400d39091ffb1780fbd9.tar.bz2 opensim-SC-93ea7bd7f470a7fd80b6400d39091ffb1780fbd9.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | 6 |
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; |