From a189da844a1ec48b321674f49a81c4e0a71c8b81 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Fri, 17 Apr 2009 15:09:37 +0000 Subject: * Moved the DefaultConfig settings into already-existing ConfigSettings --- OpenSim/Region/Application/ConfigurationLoader.cs | 12 ++++++------ OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | 4 ++-- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 2 +- OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 8 ++++---- .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index f609cc5..fea3e94 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", DefaultSettings.DefaultRegionHttpPort); - config.Set("remoting_listener_port", DefaultSettings.DefaultRegionRemotingPort); - config.Set("grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString()); + config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort); + config.Set("remoting_listener_port", ConfigSettings.DefaultRegionRemotingPort); + config.Set("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); config.Set("grid_send_key", "null"); config.Set("grid_recv_key", "null"); - config.Set("user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); + config.Set("user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); config.Set("user_send_key", "null"); config.Set("user_recv_key", "null"); - 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("asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()); + config.Set("inventory_server_url", "http://127.0.0.1:" + ConfigSettings.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 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 hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString(); hash["region_name"] = regInfo.RegionName; hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); - hash["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); + hash["remoting_port"] = ConfigSettings.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"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); ; + loginParams["home_remoting"] = ConfigSettings.DefaultRegionRemotingPort.ToString(); ; } } else diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index aae5d83..27b20ef 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"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); + GridParams["remoting_port"] = ConfigSettings.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 9a768ac..fd5c142 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 = DefaultSettings.DefaultRegionHttpPort.ToString(); + public string m_listener_port = ConfigSettings.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:" + DefaultSettings.DefaultGridServerHttpPort.ToString())); + "grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString())); m_gridinfo.Add( "userserverURL", config.Configs["Network"].GetString( - "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString())); + "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString())); m_gridinfo.Add( "assetserverURL", config.Configs["Network"].GetString( - "asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString())); + "asset_server_url", "http://127.0.0.1:" + ConfigSettings.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 c120b24..cc43d08 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:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); + "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); shard = config.Configs["Network"].GetString("shard", shard); } -- cgit v1.1