aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2007-09-14 06:02:24 +0000
committerMW2007-09-14 06:02:24 +0000
commit0d685d6a5291f619403ed3fa8b0f5b17da70dac0 (patch)
treee5cab09dd1b0fcf974b45316c14e759fb08ade22 /OpenSim/Grid
parentODE: no more slippin' & slidin' (diff)
downloadopensim-SC-0d685d6a5291f619403ed3fa8b0f5b17da70dac0.zip
opensim-SC-0d685d6a5291f619403ed3fa8b0f5b17da70dac0.tar.gz
opensim-SC-0d685d6a5291f619403ed3fa8b0f5b17da70dac0.tar.bz2
opensim-SC-0d685d6a5291f619403ed3fa8b0f5b17da70dac0.tar.xz
Can now set the http ports that grid server and user server use.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index fed5330..89497d8 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.GridServer
119 m_gridManager.config = Cfg; 119 m_gridManager.config = Cfg;
120 120
121 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process"); 121 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
122 BaseHttpServer httpServer = new BaseHttpServer(8001); 122 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
123 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 123 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
124 124
125 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); 125 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 81a8a9d..c2822b6 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Grid.UserServer
93 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); 93 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
94 94
95 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 95 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
96 BaseHttpServer httpServer = new BaseHttpServer(8002); 96 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
97 97
98 httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); 98 httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
99 99