aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-08-31 12:57:51 +0100
committerMelanie2012-08-31 14:32:31 +0100
commit05648c2c4ad1283f5bd975c4a50ca5a949e67994 (patch)
treea2d16cd47f7ace912e632f41fd8a76d27ca913ed
parentmoving code that will be common into private static method (diff)
downloadopensim-SC_OLD-05648c2c4ad1283f5bd975c4a50ca5a949e67994.zip
opensim-SC_OLD-05648c2c4ad1283f5bd975c4a50ca5a949e67994.tar.gz
opensim-SC_OLD-05648c2c4ad1283f5bd975c4a50ca5a949e67994.tar.bz2
opensim-SC_OLD-05648c2c4ad1283f5bd975c4a50ca5a949e67994.tar.xz
changing to use Type argument instead of object
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index de0e864..21aab84 100644
--- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -130,9 +130,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
130 m_scriptModule.PostScriptEvent(script, "link_message", args); 130 m_scriptModule.PostScriptEvent(script, "link_message", args);
131 } 131 }
132 132
133 private static MethodInfo GetMethodInfoFromType(object target, string meth) 133 private static MethodInfo GetMethodInfoFromType(Type target, string meth)
134 { 134 {
135 MethodInfo mi = target.GetType().GetMethod(meth, 135 MethodInfo mi = target.GetMethod(meth,
136 BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance); 136 BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
137 137
138 return mi; 138 return mi;
@@ -140,7 +140,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
140 140
141 public void RegisterScriptInvocation(object target, string meth) 141 public void RegisterScriptInvocation(object target, string meth)
142 { 142 {
143 MethodInfo mi = GetMethodInfoFromType(target, meth); 143 MethodInfo mi = GetMethodInfoFromType(target.GetType(), meth);
144 if (mi == null) 144 if (mi == null)
145 { 145 {
146 m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}",meth); 146 m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}",meth);