* Some more work on refactoring configs;

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

5 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 8aa8dde..f609cc5 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -252,16 +252,16 @@ namespace OpenSim
 
                 config.Set("default_location_x", 1000);
                 config.Set("default_location_y", 1000);
-                config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort);
-                config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort);
-                config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
+                config.Set("http_listener_port", DefaultSettings.DefaultRegionHttpPort);
+                config.Set("remoting_listener_port", DefaultSettings.DefaultRegionRemotingPort);
+                config.Set("grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString());
                 config.Set("grid_send_key", "null");
                 config.Set("grid_recv_key", "null");
-                config.Set("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
+                config.Set("user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString());
                 config.Set("user_send_key", "null");
                 config.Set("user_recv_key", "null");
-                config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString());
-                config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
+                config.Set("asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString());
+                config.Set("inventory_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort.ToString());
                 config.Set("secure_inventory_server", "true");
             }
 
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;
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index bc7e7b2..9a768ac 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
 
         //DataServices and networking
         private string m_dataServices = "noservices";
-        public string m_listener_port = NetworkServersInfo.DefaultHttpListenerPort.ToString();
+        public string m_listener_port = DefaultSettings.DefaultRegionHttpPort.ToString();
         public string m_hostname = "127.0.0.1";
 
         //Update timers
@@ -106,15 +106,15 @@ namespace OpenSim.Region.DataSnapshot
                             m_gridinfo.Add(
                                  "gridserverURL", 
                                  config.Configs["Network"].GetString(
-                                     "grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()));
+                                     "grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString()));
                             m_gridinfo.Add(
                                  "userserverURL", 
                                  config.Configs["Network"].GetString(
-                                 "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()));
+                                 "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()));
                             m_gridinfo.Add(
                                  "assetserverURL", 
                                  config.Configs["Network"].GetString(
-                                 "asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()));
+                                 "asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString()));
                         }
 
                         m_gridinfo.Add(
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0964821..c120b24 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8808,7 +8808,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 shard 
                     = config.Configs["Network"].GetString(
-                        "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
+                        "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString());
                 shard = config.Configs["Network"].GetString("shard", shard);
             }