aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs23
1 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index fa2a989..2a3f947 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -326,12 +326,25 @@ namespace OpenSim
326 326
327 m_moduleLoader = new ModuleLoader(m_log, m_config); 327 m_moduleLoader = new ModuleLoader(m_log, m_config);
328 328
329 MainLog.Instance.Verbose("Plugins", "Loading OpenSim application plugins"); 329 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup");
330 foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/Startup")) 330 MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count);
331 { 331
332 foreach (TypeExtensionNode node in nodes)
333 {
332 IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance(); 334 IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance();
333 plugin.Initialise(this); 335
334 m_plugins.Add(plugin); 336 // Debug code to try and track down a bizzare ubuntu/mono/linux bug on standalone where we
337 // appear to try and initialize all the plugins twice. Currently disabled
338// MainLog.Instance.Verbose("PLUGINS", "Hitting plugin {0}", plugin.ToString());
339// if (m_plugins.Contains(plugin))
340// {
341// MainLog.Instance.Verbose("PLUGINS", "Skipping {0}", plugin.ToString());
342// }
343// else
344// {
345 plugin.Initialise(this);
346 m_plugins.Add(plugin);
347// }
335 } 348 }
336 349
337 // Start UDP servers 350 // Start UDP servers