Restoring LoadPlugin as it was before. Justin's last change made it throw.

2010-03-15 19:34:14 -07:00 · 2010-03-15 19:34:14 -07:00 · 76106e39d9
parent 4e180e84e2
commit 76106e39d9
3 changed files with 2861 additions and 2848 deletions
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@ -104,7 +104,20 @@ namespace OpenSim.Server.Base

                        if (typeInterface != null)
                        {
-                            return (T)Activator.CreateInstance(pluginType, args);
+                            T plug = null;
+                            try
+                            {
+                                plug = (T)Activator.CreateInstance(pluginType,
+                                        args);
+                            }
+                            catch (Exception e)
+                            {
+                                if (!(e is System.MissingMethodException))
+                                    m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
+                                return null;
+                            }
+
+                            return plug;
                        }
                    }
                }