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/Region/Communications/OGS1 | |
parent | Some refactoring of the RestObjectPoster (and related classes). (diff) | |
download | opensim-SC_OLD-4bde56457f574060c1aaaca8effba1f6fe00b6c7.zip opensim-SC_OLD-4bde56457f574060c1aaaca8effba1f6fe00b6c7.tar.gz opensim-SC_OLD-4bde56457f574060c1aaaca8effba1f6fe00b6c7.tar.bz2 opensim-SC_OLD-4bde56457f574060c1aaaca8effba1f6fe00b6c7.tar.xz |
removed some duplicate hard-coded port numbers. changed ports to uint.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index b11a91f..353dc28 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
166 | { | 166 | { |
167 | string simIp = (string) neighbourData["sim_ip"]; | 167 | string simIp = (string) neighbourData["sim_ip"]; |
168 | 168 | ||
169 | int port = Convert.ToInt32(neighbourData["sim_port"]); | 169 | uint port = Convert.ToUInt32(neighbourData["sim_port"]); |
170 | string externalUri = (string) neighbourData["sim_uri"]; | 170 | string externalUri = (string) neighbourData["sim_uri"]; |
171 | 171 | ||
172 | string externalIpStr = Util.GetHostFromDNS(simIp).ToString(); | 172 | string externalIpStr = Util.GetHostFromDNS(simIp).ToString(); |
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
450 | /// </summary> | 450 | /// </summary> |
451 | private void StartRemoting() | 451 | private void StartRemoting() |
452 | { | 452 | { |
453 | TcpChannel ch = new TcpChannel(NetworkServersInfo.RemotingListenerPort); | 453 | TcpChannel ch = new TcpChannel((int) NetworkServersInfo.RemotingListenerPort); |
454 | ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this. | 454 | ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this. |
455 | 455 | ||
456 | WellKnownServiceTypeEntry wellType = | 456 | WellKnownServiceTypeEntry wellType = |
@@ -559,7 +559,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
559 | // it's own remoting port! How special. | 559 | // it's own remoting port! How special. |
560 | region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); | 560 | region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); |
561 | region.RemotingAddress = region.ExternalHostName; | 561 | region.RemotingAddress = region.ExternalHostName; |
562 | region.RemotingPort = (uint) NetworkServersInfo.RemotingListenerPort; | 562 | region.RemotingPort = NetworkServersInfo.RemotingListenerPort; |
563 | if (m_localBackend.RegionUp(region,regionhandle)) | 563 | if (m_localBackend.RegionUp(region,regionhandle)) |
564 | { | 564 | { |
565 | return true; | 565 | return true; |