aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-03-26 14:21:15 +0100
committerMelanie2012-03-26 14:21:15 +0100
commit3810e98474a4fa5d93f68da6704f7684ff956da2 (patch)
treeb1be0f4000df8a1e8a8abd760199a753f7b0e1c1
parentAdd a hust UUID to the script invocations (diff)
parentFix compile error in ScriptModuelComms and add some debugging into the modInvoke (diff)
downloadopensim-SC_OLD-3810e98474a4fa5d93f68da6704f7684ff956da2.zip
opensim-SC_OLD-3810e98474a4fa5d93f68da6704f7684ff956da2.tar.gz
opensim-SC_OLD-3810e98474a4fa5d93f68da6704f7684ff956da2.tar.bz2
opensim-SC_OLD-3810e98474a4fa5d93f68da6704f7684ff956da2.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index 1e755ba..0605590 100644
--- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -130,10 +130,18 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
130 130
131 public void RegisterScriptInvocation(object target, string meth) 131 public void RegisterScriptInvocation(object target, string meth)
132 { 132 {
133 m_log.DebugFormat("[MODULE COMMANDS] Register method {0} from type {1}",meth,target.GetType().Name);
134
135
133 MethodInfo mi = target.GetType().GetMethod(meth, 136 MethodInfo mi = target.GetType().GetMethod(meth,
134 BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance); 137 BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
138 if (mi == null)
139 {
140 m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}",meth);
141 return;
142 }
143
135 Type delegateType; 144 Type delegateType;
136
137 var typeArgs = mi.GetParameters() 145 var typeArgs = mi.GetParameters()
138 .Select(p => p.ParameterType) 146 .Select(p => p.ParameterType)
139 .ToList(); 147 .ToList();
@@ -197,6 +205,8 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
197 return "modInvokeR"; 205 return "modInvokeR";
198 else if (sid.ReturnType == typeof(object[])) 206 else if (sid.ReturnType == typeof(object[]))
199 return "modInvokeL"; 207 return "modInvokeL";
208
209 m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name);
200 } 210 }
201 } 211 }
202 212