Merge branch 'avination' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-06 00:15:54 +00:00
parent 81552f41c6 9ffa08ea6b
commit 339d8ef2a6
10 changed files with 68 additions and 42 deletions
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -262,6 +262,8 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
                        return "modInvokeR";
                    else if (sid.ReturnType == typeof(object[]))
                        return "modInvokeL";
+                    else if (sid.ReturnType == typeof(void))
+                        return "modInvokeN";

                    m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name);
                }