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
     {

         // 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();

 

         /// <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
 {
     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()
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;
 namespace OpenSim.Region.ScriptEngine.RemoteServer

 {

     /// <summary>

+    /// Handles events from OpenSim. Uses RemoteServer to send commands.

     /// </summary>

     [Serializable]

     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
 {

     class RemoteServer

     {

+        // Handles connections to servers

+        // Create and returns server object

 

         public OpenSim.Grid.ScriptServer.RemotingObject Connect(string hostname, int port)

         {

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;
 namespace OpenSim.Region.ScriptEngine.RemoteServer

 {

     /// <summary>

-    /// This is the root object for ScriptEngine. Objects access each other trough this class.

+    /// This is the root object for RemoteServer. Objects access each other trough this class.

     /// </summary>

     /// 

     [Serializable]

@@ -43,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
     {

         internal Scene World;

         internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim

-        internal RemoteServer m_RemoteServer;

+        internal RemoteServer m_RemoteServer; // Handles connections to remote servers

 

         private LogBase m_log;