diff options
author | lbsa71 | 2009-04-17 05:52:46 +0000 |
---|---|---|
committer | lbsa71 | 2009-04-17 05:52:46 +0000 |
commit | bbe1e196963fe8609a1070793b8439c293261d24 (patch) | |
tree | 32102a5e67d7e007d5efe473aef3d331f3697726 /OpenSim/Region/Communications | |
parent | * Added some debug info if MXP is enabled. (diff) | |
download | opensim-SC_OLD-bbe1e196963fe8609a1070793b8439c293261d24.zip opensim-SC_OLD-bbe1e196963fe8609a1070793b8439c293261d24.tar.gz opensim-SC_OLD-bbe1e196963fe8609a1070793b8439c293261d24.tar.bz2 opensim-SC_OLD-bbe1e196963fe8609a1070793b8439c293261d24.tar.xz |
* Some more work on refactoring configs;
* Moved the constants out into a separate DefaultConfig
* Pulled configMember up
* Some minor CCC
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index 43faead..05dd8e1 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | |||
@@ -552,7 +552,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
552 | hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString(); | 552 | hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString(); |
553 | hash["region_name"] = regInfo.RegionName; | 553 | hash["region_name"] = regInfo.RegionName; |
554 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); | 554 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); |
555 | hash["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString(); | 555 | hash["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); |
556 | //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port); | 556 | //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port); |
557 | 557 | ||
558 | 558 | ||
@@ -640,7 +640,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
640 | m_log.Debug(" >> " + loginParams["home_address"] + " <<"); | 640 | m_log.Debug(" >> " + loginParams["home_address"] + " <<"); |
641 | m_log.Debug(" --------- ------------ -------"); | 641 | m_log.Debug(" --------- ------------ -------"); |
642 | loginParams["home_port"] = rinfo.HttpPort.ToString(); | 642 | loginParams["home_port"] = rinfo.HttpPort.ToString(); |
643 | loginParams["home_remoting"] = NetworkServersInfo.RemotingListenerPort.ToString(); ; | 643 | loginParams["home_remoting"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); ; |
644 | } | 644 | } |
645 | } | 645 | } |
646 | else | 646 | else |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index f47abe8..aae5d83 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
119 | GridParams["region_locy"] = regionInfo.RegionLocY.ToString(); | 119 | GridParams["region_locy"] = regionInfo.RegionLocY.ToString(); |
120 | GridParams["sim_name"] = regionInfo.RegionName; | 120 | GridParams["sim_name"] = regionInfo.RegionName; |
121 | GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); | 121 | GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); |
122 | GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString(); | 122 | GridParams["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); |
123 | GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString(); | 123 | GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString(); |
124 | GridParams["originUUID"] = regionInfo.originRegionID.ToString(); | 124 | GridParams["originUUID"] = regionInfo.originRegionID.ToString(); |
125 | GridParams["server_uri"] = regionInfo.ServerURI; | 125 | GridParams["server_uri"] = regionInfo.ServerURI; |