diff options
| author | Justin Clark-Casey (justincc) | 2013-03-06 23:07:04 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-03-06 23:07:04 +0000 |
| commit | 2fe938d11d28bc64adeed3bb2acb19d074b31230 (patch) | |
| tree | 63f4c32c1096a52b0104b822685f8be1faec2aec /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Add code for testing event queue messages recevied on region cross. (diff) | |
| parent | Per discussions with justincc... split the JsonStore type (diff) | |
| download | opensim-SC_OLD-2fe938d11d28bc64adeed3bb2acb19d074b31230.zip opensim-SC_OLD-2fe938d11d28bc64adeed3bb2acb19d074b31230.tar.gz opensim-SC_OLD-2fe938d11d28bc64adeed3bb2acb19d074b31230.tar.bz2 opensim-SC_OLD-2fe938d11d28bc64adeed3bb2acb19d074b31230.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | 4 |
1 files changed, 4 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 d0922aa..21bae27 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | |||
| @@ -266,6 +266,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 266 | { | 266 | { |
| 267 | llist[i] = new LSL_Float((float)result[i]); | 267 | llist[i] = new LSL_Float((float)result[i]); |
| 268 | } | 268 | } |
| 269 | else if (result[i] is double) | ||
| 270 | { | ||
| 271 | llist[i] = new LSL_Float((double)result[i]); | ||
| 272 | } | ||
| 269 | else if (result[i] is UUID) | 273 | else if (result[i] is UUID) |
| 270 | { | 274 | { |
| 271 | llist[i] = new LSL_Key(result[i].ToString()); | 275 | llist[i] = new LSL_Key(result[i].ToString()); |