From 59f0920a8fc58ea6443768591b762f5673134840 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Sat, 22 Sep 2007 13:15:52 +0000 Subject: Stand Alone ScriptEngine: early framework, ongoing planning (don't touch yet, will go through major reorganizing). Still a LOT of things needs to be solved... --- .../Scenes/Scripting/ScriptEngineInterface.cs | 9 ++++---- .../Scenes/Scripting/ScriptEngineLoader.cs | 26 +++++++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Scripting') diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs index 06bedaf..5a330f3 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs @@ -25,11 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -/* Original code: Tedd Hansen */ -using OpenSim.Framework.Console; - -//TODO: WHERE TO PLACE THIS? - +using OpenSim.Framework.Console; + +//TODO: WHERE TO PLACE THIS? + namespace OpenSim.Region.Environment.Scenes.Scripting { public interface ScriptEngineInterface diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs index 5355388..527533d 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs @@ -26,17 +26,17 @@ * */ /* Original code: Tedd Hansen */ -using System; -using System.IO; -using System.Reflection; -using OpenSim.Framework.Console; - +using System; +using System.IO; +using System.Reflection; +using OpenSim.Framework.Console; + namespace OpenSim.Region.Environment.Scenes.Scripting { public class ScriptEngineLoader { - private LogBase m_log; - + private LogBase m_log; + public ScriptEngineLoader(LogBase logger) { m_log = logger; @@ -47,15 +47,15 @@ namespace OpenSim.Region.Environment.Scenes.Scripting ScriptEngineInterface ret = null; try { - ret = - LoadAndInitAssembly( + ret = + LoadAndInitAssembly( Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"), "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine"); } catch (Exception e) { - m_log.Error("ScriptEngine", - "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + + m_log.Error("ScriptEngine", + "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + e.StackTrace.ToString()); } return ret; @@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); //} - return ret; - } + return ret; + } } } \ No newline at end of file -- cgit v1.1