From 34d21ac94b227e0ab7c089000751e746ccf004a8 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sat, 2 Feb 2008 00:09:55 +0000
Subject: Added some error checking to MaintenanceThread, no-crash (just log)
 loading of script engines, and support to load multiple script engines

---
 OpenSim/Region/Application/OpenSimMain.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Application')

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
             //m_moduleLoader.PickupModules(scene, "ScriptEngines");
             //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
             MainLog.Instance.Verbose("MODULES", "Loading scripting engine modules");
-            m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);       
+            foreach (string module in m_scriptEngine.Split(';'))
+            {
+                string mod = module.Trim(" \t\r\n".ToCharArray()); // Clean up name
+                MainLog.Instance.Verbose("MODULES", "Loading scripting engine: " + mod);
+                try
+                {
+                    m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene);
+                }
+                catch (Exception ex)
+                {
+                    MainLog.Instance.Error("MODULES", "Failed to load script engine: " + ex.ToString());
+                }
+            }
 
             m_moduleLoader.InitialiseSharedModules(scene);
             scene.SetModuleInterfaces();
-- 
cgit v1.1