aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Hypergrid
diff options
context:
space:
mode:
authorlbsa712009-04-17 15:09:37 +0000
committerlbsa712009-04-17 15:09:37 +0000
commita189da844a1ec48b321674f49a81c4e0a71c8b81 (patch)
treeeb55b24007c0f221a7d9f84bdbb12282d161c777 /OpenSim/Region/Communications/Hypergrid
parent* remind me to never touch EstateSettings ever again. Ever. (diff)
downloadopensim-SC-a189da844a1ec48b321674f49a81c4e0a71c8b81.zip
opensim-SC-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.gz
opensim-SC-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.bz2
opensim-SC-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.xz
* Moved the DefaultConfig settings into already-existing ConfigSettings
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 05dd8e1..fc3a134 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"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); 555 hash["remoting_port"] = ConfigSettings.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"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); ; 643 loginParams["home_remoting"] = ConfigSettings.DefaultRegionRemotingPort.ToString(); ;
644 } 644 }
645 } 645 }
646 else 646 else