Merge branch 'master' into vehicles

1 files changed, 7 insertions, 6 deletions

diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index ddc37ed..6c0c74d 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -341,14 +341,15 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
 
                 // Actually load it
                 INonSharedRegionModule module = null;
-                try
-                {
+
+                Type[] ctorParamTypes = new Type[ctorArgs.Length];
+                for (int i = 0; i < ctorParamTypes.Length; i++)
+                    ctorParamTypes[i] = ctorArgs[i].GetType();
+
+                if (node.Type.GetConstructor(ctorParamTypes) != null)
                     module = (INonSharedRegionModule)Activator.CreateInstance(node.Type, ctorArgs);
-                }
-                catch
-                {
+                else
                     module = (INonSharedRegionModule)Activator.CreateInstance(node.Type);
-                }
 
                 // Check for replaceable interfaces
                 Type replaceableInterface = module.ReplaceableInterface;