aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorTedd Hansen2007-12-30 22:57:27 +0000
committerTedd Hansen2007-12-30 22:57:27 +0000
commit5b8620d82fa1fa17bcd8b2ff6050c58d34509c77 (patch)
tree97ef10a05a0625bb384a09b7ce3d0a1ce5069c50 /OpenSim/Grid
parentserver->script event path almost ready for remote scriptengine (translation t... (diff)
downloadopensim-SC-5b8620d82fa1fa17bcd8b2ff6050c58d34509c77.zip
opensim-SC-5b8620d82fa1fa17bcd8b2ff6050c58d34509c77.tar.gz
opensim-SC-5b8620d82fa1fa17bcd8b2ff6050c58d34509c77.tar.bz2
opensim-SC-5b8620d82fa1fa17bcd8b2ff6050c58d34509c77.tar.xz
Comments + fix = in theory stand alone script server + "RemoteSevrver" ScriptEngine (as opposed to "DotNetEngine") should work for a single region. It will however not work because it doesn't have two-way communication.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingObject.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs15
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs
index f095ca4..4c5a176 100644
--- a/OpenSim/Grid/ScriptServer/RemotingObject.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs
@@ -9,7 +9,8 @@ namespace OpenSim.Grid.ScriptServer
9 { 9 {
10 // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance. 10 // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance.
11 11
12 // Expose ScriptEngine 12 // Expose ScriptEngine directly for now ... this is not very secure :)
13 // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE!
13 public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine(); 14 public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine();
14 15
15 /// <summary> 16 /// <summary>
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 1749376..8bba38a 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -34,17 +34,26 @@ namespace OpenSim.Grid.ScriptServer
34{ 34{
35 public class ScriptServerMain : conscmd_callback 35 public class ScriptServerMain : conscmd_callback
36 { 36 {
37 //
38 // Root object. Creates objects used.
39 //
40 private int listenPort = 1234;
37 private readonly string m_logFilename = ("region-console.log"); 41 private readonly string m_logFilename = ("region-console.log");
38 internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region
39 internal ScriptEngineManager ScriptEngines; // Loads scriptengines
40 private LogBase m_log; 42 private LogBase m_log;
41 43
44 // Objects we use
45 internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region
46 //internal ScriptEngineManager ScriptEngines; // Loads scriptengines
47 internal RemotingServer m_RemotingServer;
48
42 public ScriptServerMain() 49 public ScriptServerMain()
43 { 50 {
44 m_log = CreateLog(); 51 m_log = CreateLog();
45 52
46 RegionScriptDaemon = new RegionCommManager(this, m_log); 53 RegionScriptDaemon = new RegionCommManager(this, m_log);
47 ScriptEngines = new ScriptEngineManager(this, m_log); 54 //ScriptEngines = new ScriptEngineManager(this, m_log);
55 m_RemotingServer = new RemotingServer();
56 m_RemotingServer.CreateServer(listenPort, "DotNetEngine");
48 } 57 }
49 58
50 ~ScriptServerMain() 59 ~ScriptServerMain()