diff options
author | Tedd Hansen | 2008-01-09 17:13:02 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-09 17:13:02 +0000 |
commit | 260145a7e62d9d30bd74ee21288d36c95c8b0443 (patch) | |
tree | 7bdaa66ceffe71129968f506e2ab7af04eacc9d6 /OpenSim/Grid/ScriptServer/ScriptServerMain.cs | |
parent | Prim inventory script saving phase 2. (diff) | |
download | opensim-SC_OLD-260145a7e62d9d30bd74ee21288d36c95c8b0443.zip opensim-SC_OLD-260145a7e62d9d30bd74ee21288d36c95c8b0443.tar.gz opensim-SC_OLD-260145a7e62d9d30bd74ee21288d36c95c8b0443.tar.bz2 opensim-SC_OLD-260145a7e62d9d30bd74ee21288d36c95c8b0443.tar.xz |
Dynamic loading of ScriptEngine in ScriptServer
ScriptServer event pipe (OpenSim->ScriptServer->ScriptEngine) should in theory be done
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/ScriptServer/ScriptServerMain.cs | 21 |
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 @@ | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Framework.Console; | 31 | using OpenSim.Framework.Console; |
32 | using OpenSim.Grid.ScriptServer.ScriptServer; | ||
33 | using OpenSim.Region.ScriptEngine.Common; | ||
32 | 34 | ||
33 | namespace OpenSim.Grid.ScriptServer | 35 | namespace 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) |