aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-03-26 03:22:26 +0100
committerMelanie2012-03-26 03:22:26 +0100
commite05c72d32f6d87f13080991e1a7dd5c17a2c8bd8 (patch)
tree533f2d6ddc1ee64d2a34603d54322ae5b32ff1c4 /OpenSim/Region
parentDynamically create the delegate type to reduce complexity in the caller (diff)
parentFurther simplify ScriptComms (diff)
downloadopensim-SC_OLD-e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8.zip
opensim-SC_OLD-e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8.tar.gz
opensim-SC_OLD-e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8.tar.bz2
opensim-SC_OLD-e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index e0683a0..7fc8759 100644
--- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -128,8 +128,10 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
128 m_scriptModule.PostScriptEvent(script, "link_message", args); 128 m_scriptModule.PostScriptEvent(script, "link_message", args);
129 } 129 }
130 130
131 public void RegisterScriptInvocation(object target, MethodInfo mi) 131 public void RegisterScriptInvocation(object target, string meth)
132 { 132 {
133 MethodInfo mi = target.GetType()..GetMethod(meth,
134 BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
133 Type delegateType; 135 Type delegateType;
134 136
135 var typeArgs = mi.GetParameters() 137 var typeArgs = mi.GetParameters()