* Moved the DefaultConfig settings into already-existing ConfigSettings

This commit is contained in:
lbsa71
2009-04-17 15:09:37 +00:00
parent 1759d05cdf
commit a189da844a
15 changed files with 59 additions and 68 deletions

View File

@@ -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(