aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingObject.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs15
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs4
5 files changed, 19 insertions, 6 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()
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
index f0a3aa1..d539dc4 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework;
33namespace OpenSim.Region.ScriptEngine.RemoteServer 33namespace OpenSim.Region.ScriptEngine.RemoteServer
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// Handles events from OpenSim. Uses RemoteServer to send commands.
36 /// </summary> 37 /// </summary>
37 [Serializable] 38 [Serializable]
38 internal class EventManager 39 internal class EventManager
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
index 423e6be..1a528c8 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
@@ -9,6 +9,8 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
9{ 9{
10 class RemoteServer 10 class RemoteServer
11 { 11 {
12 // Handles connections to servers
13 // Create and returns server object
12 14
13 public OpenSim.Grid.ScriptServer.RemotingObject Connect(string hostname, int port) 15 public OpenSim.Grid.ScriptServer.RemotingObject Connect(string hostname, int port)
14 { 16 {
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
index 679d5d4..1853b65 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.Environment.Scenes;
35namespace OpenSim.Region.ScriptEngine.RemoteServer 35namespace OpenSim.Region.ScriptEngine.RemoteServer
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// This is the root object for ScriptEngine. Objects access each other trough this class. 38 /// This is the root object for RemoteServer. Objects access each other trough this class.
39 /// </summary> 39 /// </summary>
40 /// 40 ///
41 [Serializable] 41 [Serializable]
@@ -43,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
43 { 43 {
44 internal Scene World; 44 internal Scene World;
45 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim 45 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim
46 internal RemoteServer m_RemoteServer; 46 internal RemoteServer m_RemoteServer; // Handles connections to remote servers
47 47
48 private LogBase m_log; 48 private LogBase m_log;
49 49