diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 29476b9..4a24d22 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3306,7 +3306,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3306 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; | 3306 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
3307 | 3307 | ||
3308 | if (attachmentsModule != null) | 3308 | if (attachmentsModule != null) |
3309 | return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false); | 3309 | return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false, true); |
3310 | else | 3310 | else |
3311 | return false; | 3311 | return false; |
3312 | } | 3312 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index d0922aa..542222e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | |||
@@ -136,7 +136,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
136 | // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); | 136 | // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); |
137 | 137 | ||
138 | Type returntype = m_comms.LookupReturnType(fname); | 138 | Type returntype = m_comms.LookupReturnType(fname); |
139 | if (returntype != typeof(string)) | 139 | if (returntype != typeof(void)) |
140 | MODError(String.Format("return type mismatch for {0}",fname)); | 140 | MODError(String.Format("return type mismatch for {0}",fname)); |
141 | 141 | ||
142 | modInvoke(fname,parms); | 142 | modInvoke(fname,parms); |
@@ -325,6 +325,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
325 | if (result != null) | 325 | if (result != null) |
326 | return result; | 326 | return result; |
327 | 327 | ||
328 | Type returntype = m_comms.LookupReturnType(fname); | ||
329 | if (returntype == typeof(void)) | ||
330 | return null; | ||
331 | |||
328 | MODError(String.Format("Invocation of {0} failed; null return value",fname)); | 332 | MODError(String.Format("Invocation of {0} failed; null return value",fname)); |
329 | } | 333 | } |
330 | catch (Exception e) | 334 | catch (Exception e) |