aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/IApplicationPlugin.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs11
2 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index 4f81354..45b0cd0 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -37,5 +37,6 @@ namespace OpenSim
37 { 37 {
38 void Initialise(OpenSimMain openSim); 38 void Initialise(OpenSimMain openSim);
39 void Close(); 39 void Close();
40 string ModuleName();
40 } 41 }
41} \ No newline at end of file 42} \ No newline at end of file
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index f41ec21..9f6d934 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -294,14 +294,12 @@ namespace OpenSim
294 m_log = CreateLog(); 294 m_log = CreateLog();
295 MainLog.Instance = m_log; 295 MainLog.Instance = m_log;
296 296
297 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #1");
298 // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp 297 // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
299 // TerrainManager, StorageManager, HTTP Server 298 // TerrainManager, StorageManager, HTTP Server
300 // This base will call abstract Initialize 299 // This base will call abstract Initialize
301 base.StartUp(); 300 base.StartUp();
302 301
303 302
304 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #2");
305 // StandAlone mode? m_sandbox is determined by !startupConfig.GetBoolean("gridmode", false) 303 // StandAlone mode? m_sandbox is determined by !startupConfig.GetBoolean("gridmode", false)
306 if (m_sandbox) 304 if (m_sandbox)
307 { 305 {
@@ -340,26 +338,21 @@ namespace OpenSim
340 m_httpServer.AddStreamHandler(new SimStatusHandler()); 338 m_httpServer.AddStreamHandler(new SimStatusHandler());
341 } 339 }
342 340
343 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #3");
344 // Create a ModuleLoader instance 341 // Create a ModuleLoader instance
345 m_moduleLoader = new ModuleLoader(m_log, m_config); 342 m_moduleLoader = new ModuleLoader(m_log, m_config);
346 343
347 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #4");
348 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup"); 344 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup");
349 MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count); 345 MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count);
350 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #5");
351 346
352 int ctedd = 0; 347 int modcount = 0;
353 foreach (TypeExtensionNode node in nodes) 348 foreach (TypeExtensionNode node in nodes)
354 { 349 {
355 IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance(); 350 IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance();
356 MainLog.Instance.Debug("PLUGINS", "Loading OpenSim application plugin: ", plugin.GetType().AssemblyQualifiedName.ToString()); 351 MainLog.Instance.Debug("PLUGINS", "Loading OpenSim application plugin(" + modcount + "): ", plugin.ModuleName());
357 352
358 plugin.Initialise(this); 353 plugin.Initialise(this);
359 m_plugins.Add(plugin); 354 m_plugins.Add(plugin);
360 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #6: " + ++ctedd);
361 } 355 }
362 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #7");
363 356
364 // Start UDP servers 357 // Start UDP servers
365 //for (int i = 0; i < m_udpServers.Count; i++) 358 //for (int i = 0; i < m_udpServers.Count; i++)