aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/ScriptServer/ScriptServerMain.cs')
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs21
1 files changed, 15 insertions, 6 deletions
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 884a09e..568c12b 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -29,6 +29,8 @@
29using System.IO; 29using System.IO;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
32using OpenSim.Grid.ScriptServer.ScriptServer;
33using OpenSim.Region.ScriptEngine.Common;
32 34
33namespace OpenSim.Grid.ScriptServer 35namespace OpenSim.Grid.ScriptServer
34{ 36{
@@ -41,19 +43,26 @@ namespace OpenSim.Grid.ScriptServer
41 private readonly string m_logFilename = ("region-console.log"); 43 private readonly string m_logFilename = ("region-console.log");
42 private LogBase m_log; 44 private LogBase m_log;
43 45
46 // TEMP
47 public static ScriptServerInterfaces.ScriptEngine Engine;
48
44 // Objects we use 49 // Objects we use
45 internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region 50 internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region
46 //internal ScriptEngineManager ScriptEngines; // Loads scriptengines 51 internal ScriptEngineManager ScriptEngines; // Loads scriptengines
47 internal RemotingServer m_RemotingServer; 52 internal RemotingServer m_RemotingServer;
48 53
49 public ScriptServerMain() 54 public ScriptServerMain()
50 { 55 {
51 m_log = CreateLog(); 56 m_log = CreateLog();
52 57
53 RegionScriptDaemon = new RegionCommManager(this, m_log); 58 // Set up script engine mananger
54 //ScriptEngines = new ScriptEngineManager(this, m_log); 59 ScriptEngines = new ScriptEngineManager(this, m_log);
55 m_RemotingServer = new RemotingServer(); 60
56 m_RemotingServer.CreateServer(listenPort, "DotNetEngine"); 61 // Load DotNetEngine
62 Engine = ScriptEngines.LoadEngine("DotNetEngine");
63
64 // Set up server
65 m_RemotingServer = new RemotingServer(listenPort, "DotNetEngine");
57 System.Console.ReadLine(); 66 System.Console.ReadLine();
58 } 67 }
59 68
@@ -68,7 +77,7 @@ namespace OpenSim.Grid.ScriptServer
68 Directory.CreateDirectory(Util.logDir()); 77 Directory.CreateDirectory(Util.logDir());
69 } 78 }
70 79
71 return new LogBase((Path.Combine(Util.logDir(), m_logFilename)), "Region", this, true); 80 return new LogBase((Path.Combine(Util.logDir(), m_logFilename)), "ScriptServer", this, true);
72 } 81 }
73 82
74 public void RunCmd(string command, string[] cmdparams) 83 public void RunCmd(string command, string[] cmdparams)