From 0f367bd7bbc5d22d4834e1eb0f1671381485143e Mon Sep 17 00:00:00 2001
From: diva
Date: Wed, 10 Jun 2009 13:18:32 +0000
Subject: Heart surgery no.2: the inventory service hooks. Several improvements
 in the connectors themselves. Several improvements in configurations. Needed
 to add a hack in IUserService and UserManagerBase, to be removed when that
 service is refactored.

---
 OpenSim/Server/Base/ServerUtils.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Server/Base/ServerUtils.cs')

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 1bdaf6f..8d76ffe 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -128,13 +128,20 @@ namespace OpenSim.Server.Base
                                 pluginType.ToString() !=
                                 pluginType.Namespace + "." + className)
                             continue;
-
                         Type typeInterface =
                                 pluginType.GetInterface(interfaceName, true);
                         if (typeInterface != null)
                         {
-                            T plug = (T)Activator.CreateInstance(pluginType,
-                                    args);
+                            T plug = null;
+                            try
+                            {
+                                plug = (T)Activator.CreateInstance(pluginType,
+                                        args);
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
+                            }
 
                             return plug;
                         }
-- 
cgit v1.1