aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs14
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
82 public string m_physicsEngine; 82 public string m_physicsEngine;
83 public bool m_sandbox = false; 83 public bool m_sandbox = false;
84 public bool m_loginserver; 84 public bool m_loginserver;
85 public OpenGridProtocolServer OGSServer;
85 public bool user_accounts = false; 86 public bool user_accounts = false;
86 public bool gridLocalAsset = false; 87 public bool gridLocalAsset = false;
87 88
89
88 protected ConsoleBase m_console; 90 protected ConsoleBase m_console;
89 91
90 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine) 92 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine)
@@ -203,7 +205,10 @@ namespace OpenSim
203 205
204 if (gridServer.GetName() == "Remote") 206 if (gridServer.GetName() == "Remote")
205 { 207 {
206 //we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server 208 // should startup the OGS protocol server here
209 OGSServer = new OpenGridProtocolServer(8500);
210
211 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
207 httpServer.AddXmlRPCHandler("expect_user", 212 httpServer.AddXmlRPCHandler("expect_user",
208 delegate(XmlRpcRequest request) 213 delegate(XmlRpcRequest request)
209 { 214 {
@@ -293,7 +298,12 @@ namespace OpenSim
293 298
294 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server"); 299 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
295 httpServer.Start(); 300 httpServer.Start();
296 301
302 if(gridServer.GetName() == "Remote") {
303 m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
304 OGSServer.Start();
305 }
306
297 MainServerListener(); 307 MainServerListener();
298 308
299 m_heartbeatTimer.Enabled = true; 309 m_heartbeatTimer.Enabled = true;