aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTedd Hansen2007-09-22 13:15:52 +0000
committerTedd Hansen2007-09-22 13:15:52 +0000
commit59f0920a8fc58ea6443768591b762f5673134840 (patch)
treeda6d13536a44f2b1aeef6a63dec4b099b617c16e /OpenSim/Region
parent* There. I think this concludes todays work on moving stuff to Broadcast() (diff)
downloadopensim-SC_OLD-59f0920a8fc58ea6443768591b762f5673134840.zip
opensim-SC_OLD-59f0920a8fc58ea6443768591b762f5673134840.tar.gz
opensim-SC_OLD-59f0920a8fc58ea6443768591b762f5673134840.tar.bz2
opensim-SC_OLD-59f0920a8fc58ea6443768591b762f5673134840.tar.xz
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...
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs26
2 files changed, 17 insertions, 18 deletions
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28/* Original code: Tedd Hansen */ 28using OpenSim.Framework.Console;
29using OpenSim.Framework.Console; 29
30 30//TODO: WHERE TO PLACE THIS?
31//TODO: WHERE TO PLACE THIS? 31
32
33namespace OpenSim.Region.Environment.Scenes.Scripting 32namespace OpenSim.Region.Environment.Scenes.Scripting
34{ 33{
35 public interface ScriptEngineInterface 34 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 @@
26* 26*
27*/ 27*/
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System; 29using System;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
33 33
34namespace OpenSim.Region.Environment.Scenes.Scripting 34namespace OpenSim.Region.Environment.Scenes.Scripting
35{ 35{
36 public class ScriptEngineLoader 36 public class ScriptEngineLoader
37 { 37 {
38 private LogBase m_log; 38 private LogBase m_log;
39 39
40 public ScriptEngineLoader(LogBase logger) 40 public ScriptEngineLoader(LogBase logger)
41 { 41 {
42 m_log = logger; 42 m_log = logger;
@@ -47,15 +47,15 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
47 ScriptEngineInterface ret = null; 47 ScriptEngineInterface ret = null;
48 try 48 try
49 { 49 {
50 ret = 50 ret =
51 LoadAndInitAssembly( 51 LoadAndInitAssembly(
52 Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"), 52 Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
53 "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine"); 53 "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
54 } 54 }
55 catch (Exception e) 55 catch (Exception e)
56 { 56 {
57 m_log.Error("ScriptEngine", 57 m_log.Error("ScriptEngine",
58 "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + 58 "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " +
59 e.StackTrace.ToString()); 59 e.StackTrace.ToString());
60 } 60 }
61 return ret; 61 return ret;
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
118 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 118 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
119 //} 119 //}
120 120
121 return ret; 121 return ret;
122 } 122 }
123 } 123 }
124} \ No newline at end of file 124} \ No newline at end of file