Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2026-08-08 18:25:33 +08:00 · 2013-03-08 01:07:05 +00:00
parent f954c53ddb 33dab49d22
commit 70f0587558
19 changed files with 533 additions and 173 deletions
--- 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
                {
                    llist[i] = new LSL_Float((float)result[i]);
                }
+                else if (result[i] is double)
+                {
+                    llist[i] = new LSL_Float((double)result[i]);
+                }
                else if (result[i] is UUID)
                {
                    llist[i] = new LSL_Key(result[i].ToString());