aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 00:09:55 +0000
committerTedd Hansen2008-02-02 00:09:55 +0000
commit34d21ac94b227e0ab7c089000751e746ccf004a8 (patch)
tree29ce90cb406c1bc31fe017ad880e32d7172501cb /OpenSim/Region/Application
parentMoved iniFilePath to a static and put it in OpenSim.Application.iniFilePath. (diff)
downloadopensim-SC_OLD-34d21ac94b227e0ab7c089000751e746ccf004a8.zip
opensim-SC_OLD-34d21ac94b227e0ab7c089000751e746ccf004a8.tar.gz
opensim-SC_OLD-34d21ac94b227e0ab7c089000751e746ccf004a8.tar.bz2
opensim-SC_OLD-34d21ac94b227e0ab7c089000751e746ccf004a8.tar.xz
Added some error checking to MaintenanceThread, no-crash (just log) loading of script engines, and support to load multiple script engines
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs14
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index ad5a960..7d3f7b8 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -455,7 +455,19 @@ namespace OpenSim
455 //m_moduleLoader.PickupModules(scene, "ScriptEngines"); 455 //m_moduleLoader.PickupModules(scene, "ScriptEngines");
456 //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); 456 //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
457 MainLog.Instance.Verbose("MODULES", "Loading scripting engine modules"); 457 MainLog.Instance.Verbose("MODULES", "Loading scripting engine modules");
458 m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); 458 foreach (string module in m_scriptEngine.Split(';'))
459 {
460 string mod = module.Trim(" \t\r\n".ToCharArray()); // Clean up name
461 MainLog.Instance.Verbose("MODULES", "Loading scripting engine: " + mod);
462 try
463 {
464 m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene);
465 }
466 catch (Exception ex)
467 {
468 MainLog.Instance.Error("MODULES", "Failed to load script engine: " + ex.ToString());
469 }
470 }
459 471
460 m_moduleLoader.InitialiseSharedModules(scene); 472 m_moduleLoader.InitialiseSharedModules(scene);
461 scene.SetModuleInterfaces(); 473 scene.SetModuleInterfaces();