aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-08-31 15:33:42 +0100
committerMelanie2012-08-31 15:33:42 +0100
commitcbdfca1460b5a7f7dfc6a6d9eb846d103fd17d8f (patch)
tree8fa37b6cc1df783a52e08be884f5526b1821162f
parentMerge branch 'master' into careminster (diff)
parentType.Type is RuntimeType (diff)
downloadopensim-SC-cbdfca1460b5a7f7dfc6a6d9eb846d103fd17d8f.zip
opensim-SC-cbdfca1460b5a7f7dfc6a6d9eb846d103fd17d8f.tar.gz
opensim-SC-cbdfca1460b5a7f7dfc6a6d9eb846d103fd17d8f.tar.bz2
opensim-SC-cbdfca1460b5a7f7dfc6a6d9eb846d103fd17d8f.tar.xz
Merge branch 'master' into careminster
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index 8d100e8..23cc633 100644
--- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -163,7 +163,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
163 163
164 public void RegisterScriptInvocation(object target, MethodInfo mi) 164 public void RegisterScriptInvocation(object target, MethodInfo mi)
165 { 165 {
166 m_log.DebugFormat("[MODULE COMMANDS] Register method {0} from type {1}", mi.Name, target.GetType().Name); 166 m_log.DebugFormat("[MODULE COMMANDS] Register method {0} from type {1}", mi.Name, (target is Type) ? ((Type)target).Name : target.GetType().Name);
167 167
168 Type delegateType; 168 Type delegateType;
169 List<Type> typeArgs = mi.GetParameters() 169 List<Type> typeArgs = mi.GetParameters()