aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorTedd Hansen2008-01-05 15:48:02 +0000
committerTedd Hansen2008-01-05 15:48:02 +0000
commit966f639ad6c83828d8e60ef9103ad61c360f9c3b (patch)
tree020ff9c0666d8e8980c920afd77e34660fc121f3 /OpenSim/Region/Application
parentAdded errorhandler+tip that grid server might not be running on grid registra... (diff)
downloadopensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.zip
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.gz
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.bz2
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.xz
Changes to ScriptServer to (hopefully) make it compile on both .Net and Mono.
Some debug info for startup added to find bugs. ++
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 831db22..e8453bc 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -331,8 +331,9 @@ namespace OpenSim
331 MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count); 331 MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count);
332 332
333 foreach (TypeExtensionNode node in nodes) 333 foreach (TypeExtensionNode node in nodes)
334 { 334 {
335 IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance(); 335 MainLog.Instance.Verbose("PLUGINS", "Loading OpenSim application plugin: ", node.GetType().AssemblyQualifiedName.ToString());
336 IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance();
336 337
337 plugin.Initialise(this); 338 plugin.Initialise(this);
338 m_plugins.Add(plugin); 339 m_plugins.Add(plugin);
@@ -375,7 +376,10 @@ namespace OpenSim
375 376
376 m_moduleLoader.PickupModules(scene, "."); 377 m_moduleLoader.PickupModules(scene, ".");
377 //m_moduleLoader.PickupModules(scene, "ScriptEngines"); 378 //m_moduleLoader.PickupModules(scene, "ScriptEngines");
379 //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
380 MainLog.Instance.Verbose("MODULES", "Loading scripting engine modules");
378 m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); 381 m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
382
379 383
380 384
381 m_moduleLoader.InitialiseSharedModules(scene); 385 m_moduleLoader.InitialiseSharedModules(scene);