diff options
author | Diva Canto | 2013-08-02 17:00:34 -0700 |
---|---|---|
committer | Diva Canto | 2013-08-02 17:00:34 -0700 |
commit | fdfc95174412588f5f70c1a66d9341cd8863f132 (patch) | |
tree | f7874fa1ac2f37fb299a8d6773445c1c87c22e69 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Issue: 10 simultaneous TPs, many not making it. Now bypassing the per-url loc... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-fdfc95174412588f5f70c1a66d9341cd8863f132.zip opensim-SC-fdfc95174412588f5f70c1a66d9341cd8863f132.tar.gz opensim-SC-fdfc95174412588f5f70c1a66d9341cd8863f132.tar.bz2 opensim-SC-fdfc95174412588f5f70c1a66d9341cd8863f132.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, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index 21bae27..92dd813 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | |||
@@ -319,7 +319,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
319 | 319 | ||
320 | object[] convertedParms = new object[parms.Length]; | 320 | object[] convertedParms = new object[parms.Length]; |
321 | for (int i = 0; i < parms.Length; i++) | 321 | for (int i = 0; i < parms.Length; i++) |
322 | convertedParms[i] = ConvertFromLSL(parms[i],signature[i], fname); | 322 | convertedParms[i] = ConvertFromLSL(parms[i], signature[i], fname); |
323 | 323 | ||
324 | // now call the function, the contract with the function is that it will always return | 324 | // now call the function, the contract with the function is that it will always return |
325 | // non-null but don't trust it completely | 325 | // non-null but don't trust it completely |
@@ -444,7 +444,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
444 | } | 444 | } |
445 | } | 445 | } |
446 | 446 | ||
447 | MODError(String.Format("{1}: parameter type mismatch; expecting {0}",type.Name, fname)); | 447 | MODError(String.Format("{0}: parameter type mismatch; expecting {1}, type(parm)={2}", fname, type.Name, lslparm.GetType())); |
448 | return null; | 448 | return null; |
449 | } | 449 | } |
450 | 450 | ||