* Some more work on refactoring configs;

  * Moved the constants out into a separate DefaultConfig
  * Pulled configMember up
  * Some minor CCC

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
             hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString();
             hash["region_name"] = regInfo.RegionName;
             hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
-            hash["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString();
+            hash["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString();
             //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
 
 
@@ -640,7 +640,7 @@ namespace OpenSim.Region.Communications.Hypergrid
                         m_log.Debug("  >> " + loginParams["home_address"] + " <<");
                         m_log.Debug("  --------- ------------ -------");
                         loginParams["home_port"] = rinfo.HttpPort.ToString();
-                        loginParams["home_remoting"] = NetworkServersInfo.RemotingListenerPort.ToString(); ;
+                        loginParams["home_remoting"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); ;
                     }
                 }
                 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
             GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
             GridParams["sim_name"] = regionInfo.RegionName;
             GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
-            GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString();
+            GridParams["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString();
             GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString();
             GridParams["originUUID"] = regionInfo.originRegionID.ToString();
             GridParams["server_uri"] = regionInfo.ServerURI;