* Some more work on refactoring configs;

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

1 files changed, 6 insertions, 6 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");
             }