1 files changed, 12 insertions, 2 deletions

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index edf4c62..1c3454d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -82,9 +82,11 @@ namespace OpenSim
         public string m_physicsEngine;

         public bool m_sandbox = false;

         public bool m_loginserver;

+        public OpenGridProtocolServer OGSServer;

         public bool user_accounts = false;

         public bool gridLocalAsset = false;

 

+

         protected ConsoleBase m_console;

 

         public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine)

@@ -203,7 +205,10 @@ namespace OpenSim
 

             if (gridServer.GetName() == "Remote")

             {

-                //we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server

+                // should startup the OGS protocol server here

+                OGSServer = new OpenGridProtocolServer(8500);

+

+                // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server

                 httpServer.AddXmlRPCHandler("expect_user",

                     delegate(XmlRpcRequest request)

                     {

@@ -293,7 +298,12 @@ namespace OpenSim
 

             m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");

             httpServer.Start();

-

+            

+            if(gridServer.GetName() == "Remote") {

+                m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");

+                OGSServer.Start();

+            }

+            

             MainServerListener();

 

             m_heartbeatTimer.Enabled = true;