diff options
| author | Melanie | 2013-03-06 00:15:54 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-06 00:15:54 +0000 |
| commit | 339d8ef2a657dd08bc6328da6e285b8550d05a74 (patch) | |
| tree | 612080502d4da19051a2fcc8dfb7ff26a90fbfa7 /OpenSim/Region/CoreModules/Scripting/ScriptModuleComms | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Limit each attachment point to 5 items as per spec (diff) | |
| download | opensim-SC-339d8ef2a657dd08bc6328da6e285b8550d05a74.zip opensim-SC-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.gz opensim-SC-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.bz2 opensim-SC-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/ScriptModuleComms')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs index 6bf50d2..fccf053 100644 --- 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 | |||
| 262 | return "modInvokeR"; | 262 | return "modInvokeR"; |
| 263 | else if (sid.ReturnType == typeof(object[])) | 263 | else if (sid.ReturnType == typeof(object[])) |
| 264 | return "modInvokeL"; | 264 | return "modInvokeL"; |
| 265 | else if (sid.ReturnType == typeof(void)) | ||
| 266 | return "modInvokeN"; | ||
| 265 | 267 | ||
| 266 | m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name); | 268 | m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name); |
| 267 | } | 269 | } |