diff options
| author | SignpostMarv | 2012-10-23 11:34:43 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-26 01:43:53 +0100 |
| commit | 01972cc9e8f3288330cdc7ba343b99be7f1491ec (patch) | |
| tree | 7f9d58be8c38f3e04bfac53ada7b3f822e0ab396 /OpenSim/Region | |
| parent | Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations sin... (diff) | |
| download | opensim-SC_OLD-01972cc9e8f3288330cdc7ba343b99be7f1491ec.zip opensim-SC_OLD-01972cc9e8f3288330cdc7ba343b99be7f1491ec.tar.gz opensim-SC_OLD-01972cc9e8f3288330cdc7ba343b99be7f1491ec.tar.bz2 opensim-SC_OLD-01972cc9e8f3288330cdc7ba343b99be7f1491ec.tar.xz | |
system ints can end up in LSL lists, which can cause counter-intuitive unknown list element type errors in ConvertFromLSL (via modInvoke)
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index a830a15..60bb107 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | |||
| @@ -359,6 +359,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 359 | result[i] = (string)(LSL_String)plist[i]; | 359 | result[i] = (string)(LSL_String)plist[i]; |
| 360 | else if (plist[i] is LSL_Integer) | 360 | else if (plist[i] is LSL_Integer) |
| 361 | result[i] = (int)(LSL_Integer)plist[i]; | 361 | result[i] = (int)(LSL_Integer)plist[i]; |
| 362 | else if (plist[i] is int) | ||
| 363 | result[i] = plist[i]; | ||
| 362 | else if (plist[i] is LSL_Float) | 364 | else if (plist[i] is LSL_Float) |
| 363 | result[i] = (float)(LSL_Float)plist[i]; | 365 | result[i] = (float)(LSL_Float)plist[i]; |
| 364 | else if (plist[i] is LSL_Key) | 366 | else if (plist[i] is LSL_Key) |