From afaa12a9e2fd24c03c0f46716e9758cc591703c2 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Tue, 14 Aug 2007 15:59:36 +0000 Subject: ScriptEngine: Some error handling, logs to logger --- OpenSim/Region/Application/OpenSimMain.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 4b95e02..1d1d337 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -155,7 +155,7 @@ namespace OpenSim } // Load all script engines found - //OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(); + OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log); for (int i = 0; i < configFiles.Length; i++) { @@ -166,11 +166,11 @@ namespace OpenSim UDPServer udpServer; Scene scene = SetupScene(regionInfo, out udpServer); - - //OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); - //scene.AddScriptEngine(ScriptEngine); - //// TODO: TEMP load default script - //ScriptEngine.StartScript(Path.Combine("ScriptEngines", "default.lsl"), "TEST"); + + OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); + scene.AddScriptEngine(ScriptEngine, m_log); + // TODO: TEMP load default script + ScriptEngine.StartScript(Path.Combine("ScriptEngines", "default.lsl"), "TEST"); m_localScenes.Add(scene); -- cgit v1.1