* Added MySQLDataStore (adapted from MonoSqlite

* Made startup a little bit more forgiving on dll load
* Minor renamings and musings

1 files changed, 12 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index cb72638..c64795b 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -194,19 +194,26 @@ namespace OpenSim.Region.Environment
 
             if (pluginAssembly != null)
             {
-                foreach (Type pluginType in pluginAssembly.GetTypes())
+                try
                 {
-                    if (pluginType.IsPublic)
+                    foreach (Type pluginType in pluginAssembly.GetTypes())
                     {
-                        if (!pluginType.IsAbstract)
+                        if (pluginType.IsPublic)
                         {
-                            if (pluginType.GetInterface("IRegionModule") != null)
+                            if (!pluginType.IsAbstract)
                             {
-                                modules.Add((IRegionModule) Activator.CreateInstance(pluginType));
+                                if (pluginType.GetInterface("IRegionModule") != null)
+                                {
+                                    modules.Add((IRegionModule)Activator.CreateInstance(pluginType));
+                                }
                             }
                         }
                     }
                 }
+                catch( ReflectionTypeLoadException )
+                {
+                    m_log.Verbose("MODULES", "Could not load types for [{0}].", pluginAssembly.FullName );
+                }
             }
 
             return modules.ToArray();