diff options
author | Jeff Ames | 2007-12-06 01:41:41 +0000 |
---|---|---|
committer | Jeff Ames | 2007-12-06 01:41:41 +0000 |
commit | 4bde56457f574060c1aaaca8effba1f6fe00b6c7 (patch) | |
tree | 60c081be8f3d00da63940efd81ce88de6fe1f2a5 /OpenSim/Grid | |
parent | Some refactoring of the RestObjectPoster (and related classes). (diff) | |
download | opensim-SC-4bde56457f574060c1aaaca8effba1f6fe00b6c7.zip opensim-SC-4bde56457f574060c1aaaca8effba1f6fe00b6c7.tar.gz opensim-SC-4bde56457f574060c1aaaca8effba1f6fe00b6c7.tar.bz2 opensim-SC-4bde56457f574060c1aaaca8effba1f6fe00b6c7.tar.xz |
removed some duplicate hard-coded port numbers. changed ports to uint.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 61427fa..c973f99 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.AssetServer | |||
92 | LoadDefaultAssets(); | 92 | LoadDefaultAssets(); |
93 | 93 | ||
94 | m_console.Verbose("ASSET", "Starting HTTP process"); | 94 | m_console.Verbose("ASSET", "Starting HTTP process"); |
95 | BaseHttpServer httpServer = new BaseHttpServer((int) m_config.HttpPort); | 95 | BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort); |
96 | 96 | ||
97 | httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider)); | 97 | httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider)); |
98 | httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); | 98 | httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); |
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index b793cf9..d6b30ce 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs | |||
@@ -112,7 +112,7 @@ namespace OpenSim.Grid.GridServer | |||
112 | m_gridManager.config = Cfg; | 112 | m_gridManager.config = Cfg; |
113 | 113 | ||
114 | m_console.Verbose("GRID", "Starting HTTP process"); | 114 | m_console.Verbose("GRID", "Starting HTTP process"); |
115 | BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort); | 115 | BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); |
116 | //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); | 116 | //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); |
117 | 117 | ||
118 | httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); | 118 | httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index d2ad6ae..74352ac 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer | |||
92 | m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); | 92 | m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); |
93 | 93 | ||
94 | MainLog.Instance.Verbose("REGION", "Starting HTTP process"); | 94 | MainLog.Instance.Verbose("REGION", "Starting HTTP process"); |
95 | BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort); | 95 | BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); |
96 | 96 | ||
97 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); | 97 | httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); |
98 | 98 | ||
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index ccd3548..f404cce 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim.Grid.UserServer | |||
81 | MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + | 81 | MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + |
82 | SimInfo.regionLocY); | 82 | SimInfo.regionLocY); |
83 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); | 83 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); |
84 | response.SimPort = (Int32)SimInfo.serverPort; | 84 | response.SimPort = (uint) SimInfo.serverPort; |
85 | response.RegionX = SimInfo.regionLocX; | 85 | response.RegionX = SimInfo.regionLocX; |
86 | response.RegionY = SimInfo.regionLocY; | 86 | response.RegionY = SimInfo.regionLocY; |
87 | 87 | ||
@@ -149,7 +149,7 @@ namespace OpenSim.Grid.UserServer | |||
149 | MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + | 149 | MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + |
150 | SimInfo.regionLocY); | 150 | SimInfo.regionLocY); |
151 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); | 151 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); |
152 | response.SimPort = (Int32)SimInfo.serverPort; | 152 | response.SimPort = (uint) SimInfo.serverPort; |
153 | response.RegionX = SimInfo.regionLocX; | 153 | response.RegionX = SimInfo.regionLocX; |
154 | response.RegionY = SimInfo.regionLocY; | 154 | response.RegionY = SimInfo.regionLocY; |
155 | 155 | ||