aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs22
1 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 151ac51..e3e9b98 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -41,6 +41,7 @@ using libsecondlife.Packets;
41using OpenSim.world; 41using OpenSim.world;
42using OpenSim.Terrain; 42using OpenSim.Terrain;
43using OpenSim.Framework.Interfaces; 43using OpenSim.Framework.Interfaces;
44using OpenSim.Framework.Types;
44using OpenSim.UserServer; 45using OpenSim.UserServer;
45using OpenSim.Assets; 46using OpenSim.Assets;
46using OpenSim.CAPS; 47using OpenSim.CAPS;
@@ -82,7 +83,7 @@ namespace OpenSim
82 public string m_physicsEngine; 83 public string m_physicsEngine;
83 public bool m_sandbox = false; 84 public bool m_sandbox = false;
84 public bool m_loginserver; 85 public bool m_loginserver;
85 public OpenGridProtocolServer OGSServer; 86 public OpenGridProtocolServer OGSServer;
86 public bool user_accounts = false; 87 public bool user_accounts = false;
87 public bool gridLocalAsset = false; 88 public bool gridLocalAsset = false;
88 89
@@ -205,8 +206,8 @@ namespace OpenSim
205 206
206 if (gridServer.GetName() == "Remote") 207 if (gridServer.GetName() == "Remote")
207 { 208 {
208 // should startup the OGS protocol server here 209 // should startup the OGS protocol server here
209 OGSServer = new OpenGridProtocolServer(8500); 210 //OGSServer = new OpenGridProtocolServer(8500);
210 211
211 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server 212 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
212 httpServer.AddXmlRPCHandler("expect_user", 213 httpServer.AddXmlRPCHandler("expect_user",
@@ -298,12 +299,13 @@ namespace OpenSim
298 299
299 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server"); 300 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
300 httpServer.Start(); 301 httpServer.Start();
301 302
302 if(gridServer.GetName() == "Remote") { 303 if (gridServer.GetName() == "Remote")
303 m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server"); 304 {
304 OGSServer.Start(); 305 m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
305 } 306 OGSServer.Start();
306 307 }
308
307 MainServerListener(); 309 MainServerListener();
308 310
309 m_heartbeatTimer.Enabled = true; 311 m_heartbeatTimer.Enabled = true;
@@ -523,7 +525,7 @@ namespace OpenSim
523 525
524 case "terrain": 526 case "terrain":
525 string result = ""; 527 string result = "";
526 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams,ref result)) 528 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
527 { 529 {
528 m_console.WriteLine(result); 530 m_console.WriteLine(result);
529 } 531 }