aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJohan Berntsson2008-03-11 03:10:21 +0000
committerJohan Berntsson2008-03-11 03:10:21 +0000
commitbec947cde31a57f4c240ac63b0cb30daef49e3e8 (patch)
treebdffce1a8ee7dca2d3fc7617bb8f50f1a699487a /OpenSim/Region/Application
parentthis fixes a port initialization problem in the LoadBalancer plugin (diff)
downloadopensim-SC_OLD-bec947cde31a57f4c240ac63b0cb30daef49e3e8.zip
opensim-SC_OLD-bec947cde31a57f4c240ac63b0cb30daef49e3e8.tar.gz
opensim-SC_OLD-bec947cde31a57f4c240ac63b0cb30daef49e3e8.tar.bz2
opensim-SC_OLD-bec947cde31a57f4c240ac63b0cb30daef49e3e8.tar.xz
The plugin loader can now handle plugin dependencies without hardcoding
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs23
1 files changed, 5 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index ea25147..33d0999 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -374,27 +374,14 @@ namespace OpenSim
374 m_moduleLoader = new ModuleLoader(m_config); 374 m_moduleLoader = new ModuleLoader(m_config);
375 375
376 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup"); 376 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup");
377 m_log.InfoFormat("[PLUGINS]: Loading {0} OpenSim application plugins", nodes.Count);
378 foreach (TypeExtensionNode node in nodes) 377 foreach (TypeExtensionNode node in nodes)
379 { 378 {
380 // First load the proxy server (if present) 379 m_log.InfoFormat("[PLUGINS]: Loading OpenSim application plugin {0}", node.Path);
381 if(node.Path.Contains("Proxy")) 380 IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance();
382 { 381 plugin.Initialise(this);
383 IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance(); 382 m_plugins.Add(plugin);
384 plugin.Initialise(this);
385 m_plugins.Add(plugin);
386 }
387 }
388 // then load the other modules
389 foreach (TypeExtensionNode node in nodes)
390 {
391 if(!node.Path.Contains("Proxy"))
392 {
393 IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance();
394 plugin.Initialise(this);
395 m_plugins.Add(plugin);
396 }
397 } 383 }
384
398 // Start UDP servers 385 // Start UDP servers
399 //for (int i = 0; i < m_udpServers.Count; i++) 386 //for (int i = 0; i < m_udpServers.Count; i++)
400 //{ 387 //{