OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding support for finding static methods

integration
SignpostMarv 2012-08-31 13:09:15 +01:00 committed by Melanie
parent bcf944db48
commit e6f43023b6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
View File

@ -130,17 +130,23 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
m_scriptModule.PostScriptEvent(script, "link_message", args); m_scriptModule.PostScriptEvent(script, "link_message", args);
} }
private static MethodInfo GetMethodInfoFromType(Type target, string meth) private static MethodInfo GetMethodInfoFromType(Type target, string meth, bool searchInstanceMethods)
{ {
BindingFlags getMethodFlags = BindingFlags getMethodFlags =
BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance; BindingFlags.NonPublic | BindingFlags.Public;
if (searchInstanceMethods)
getMethodFlags |= BindingFlags.Instance;
else
getMethodFlags |= BindingFlags.Static;
return target.GetMethod(meth, return target.GetMethod(meth,
getMethodFlags); getMethodFlags);
} }
public void RegisterScriptInvocation(object target, string meth) public void RegisterScriptInvocation(object target, string meth)
{ {
MethodInfo mi = GetMethodInfoFromType(target.GetType(), meth); MethodInfo mi = GetMethodInfoFromType(target.GetType(), meth, true);
if (mi == null) if (mi == null)
{ {
m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}",meth); m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}",meth);