From 5b8620d82fa1fa17bcd8b2ff6050c58d34509c77 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Sun, 30 Dec 2007 22:57:27 +0000 Subject: 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. --- OpenSim/Grid/ScriptServer/RemotingObject.cs | 3 ++- OpenSim/Grid/ScriptServer/ScriptServerMain.cs | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'OpenSim/Grid/ScriptServer') 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 { // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance. - // Expose ScriptEngine + // Expose ScriptEngine directly for now ... this is not very secure :) + // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE! public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine(); /// 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 { public class ScriptServerMain : conscmd_callback { + // + // Root object. Creates objects used. + // + private int listenPort = 1234; private readonly string m_logFilename = ("region-console.log"); - internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region - internal ScriptEngineManager ScriptEngines; // Loads scriptengines private LogBase m_log; + // Objects we use + internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region + //internal ScriptEngineManager ScriptEngines; // Loads scriptengines + internal RemotingServer m_RemotingServer; + public ScriptServerMain() { m_log = CreateLog(); RegionScriptDaemon = new RegionCommManager(this, m_log); - ScriptEngines = new ScriptEngineManager(this, m_log); + //ScriptEngines = new ScriptEngineManager(this, m_log); + m_RemotingServer = new RemotingServer(); + m_RemotingServer.CreateServer(listenPort, "DotNetEngine"); } ~ScriptServerMain() -- cgit v1.1