1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
index a0622ea..c4f4bbe 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
@@ -45,8 +45,17 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
        {
            // New region is being created
            // Create a new script engine
-            scriptEngine = Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as RegionScriptEngineBase;
+            try
-            scriptEngine.Initialize(scene, source);
+            {
+                scriptEngine =
+                    Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as
+                    RegionScriptEngineBase;
+                scriptEngine.Initialize(scene, source);
+            }
+            catch (Exception ex)
+            {
+                scriptEngine.m_log.Error("[ScriptEngine]: Unable to load engine \"" + tempScriptEngineName + "\": " + ex.ToString());
+            }
        }
        public void PostInitialise()

diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs index a0622ea..c4f4bbe 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
@@ -45,8 +45,17 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
45	{	45	{
46	// New region is being created	46	// New region is being created
47	// Create a new script engine	47	// Create a new script engine
48	scriptEngine = Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as RegionScriptEngineBase;	48	try
49	scriptEngine.Initialize(scene, source);	49	{
		50	scriptEngine =
		51	Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as
		52	RegionScriptEngineBase;
		53	scriptEngine.Initialize(scene, source);
		54	}
		55	catch (Exception ex)
		56	{
		57	scriptEngine.m_log.Error("[ScriptEngine]: Unable to load engine \"" + tempScriptEngineName + "\": " + ex.ToString());
		58	}
50	}	59	}
51		60
52	public void PostInitialise()	61	public void PostInitialise()