diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs index 6da2222..9c3f08e 100644 --- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms | |||
89 | public void RegionLoaded(Scene scene) | 89 | public void RegionLoaded(Scene scene) |
90 | { | 90 | { |
91 | m_scriptModule = scene.RequestModuleInterface<IScriptModule>(); | 91 | m_scriptModule = scene.RequestModuleInterface<IScriptModule>(); |
92 | 92 | ||
93 | if (m_scriptModule != null) | 93 | if (m_scriptModule != null) |
94 | m_log.Info("[MODULE COMMANDS]: Script engine found, module active"); | 94 | m_log.Info("[MODULE COMMANDS]: Script engine found, module active"); |
95 | } | 95 | } |
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms | |||
237 | } | 237 | } |
238 | } | 238 | } |
239 | } | 239 | } |
240 | 240 | ||
241 | public Delegate[] GetScriptInvocationList() | 241 | public Delegate[] GetScriptInvocationList() |
242 | { | 242 | { |
243 | List<Delegate> ret = new List<Delegate>(); | 243 | List<Delegate> ret = new List<Delegate>(); |
@@ -271,6 +271,8 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms | |||
271 | return "modInvokeR"; | 271 | return "modInvokeR"; |
272 | else if (sid.ReturnType == typeof(object[])) | 272 | else if (sid.ReturnType == typeof(object[])) |
273 | return "modInvokeL"; | 273 | return "modInvokeL"; |
274 | else if (sid.ReturnType == typeof(void)) | ||
275 | return "modInvokeN"; | ||
274 | 276 | ||
275 | m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name); | 277 | m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name); |
276 | } | 278 | } |
@@ -359,14 +361,14 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms | |||
359 | public object LookupModConstant(string cname) | 361 | public object LookupModConstant(string cname) |
360 | { | 362 | { |
361 | // m_log.DebugFormat("[MODULE COMMANDS] lookup constant <{0}>",cname); | 363 | // m_log.DebugFormat("[MODULE COMMANDS] lookup constant <{0}>",cname); |
362 | 364 | ||
363 | lock (m_constants) | 365 | lock (m_constants) |
364 | { | 366 | { |
365 | object value = null; | 367 | object value = null; |
366 | if (m_constants.TryGetValue(cname,out value)) | 368 | if (m_constants.TryGetValue(cname,out value)) |
367 | return value; | 369 | return value; |
368 | } | 370 | } |
369 | 371 | ||
370 | return null; | 372 | return null; |
371 | } | 373 | } |
372 | 374 | ||