Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
avinationmerge
Melanie 2012-03-26 03:22:26 +01:00
commit e05c72d32f
1 changed files with 3 additions and 1 deletions

View File

@ -128,8 +128,10 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
m_scriptModule.PostScriptEvent(script, "link_message", args);
}
public void RegisterScriptInvocation(object target, MethodInfo mi)
public void RegisterScriptInvocation(object target, string meth)
{
MethodInfo mi = target.GetType()..GetMethod(meth,
BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
Type delegateType;
var typeArgs = mi.GetParameters()