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/Framework/GridConfig.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Framework/GridConfig.cs') diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index 679c84b..b24c81f 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs @@ -40,7 +40,7 @@ namespace OpenSim.Framework public string DatabaseConnect = String.Empty; public string DefaultAssetServer = String.Empty; public string DefaultUserServer = String.Empty; - public uint HttpPort = DefaultSettings.DefaultGridServerHttpPort; + public uint HttpPort = ConfigSettings.DefaultGridServerHttpPort; public string SimRecvKey = String.Empty; public string SimSendKey = String.Empty; public string UserRecvKey = String.Empty; @@ -58,7 +58,7 @@ namespace OpenSim.Framework m_configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", - "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/", + "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/", false); m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false); @@ -68,7 +68,7 @@ namespace OpenSim.Framework m_configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", - "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false); + "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false); m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, @@ -84,7 +84,7 @@ namespace OpenSim.Framework "Database connect string", "", false); m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, - "Http Listener port", DefaultSettings.DefaultGridServerHttpPort.ToString(), false); + "Http Listener port", ConfigSettings.DefaultGridServerHttpPort.ToString(), false); m_configMember.addConfigurationOption("allow_forceful_banlines", ConfigurationOption.ConfigurationTypes.TYPE_STRING, -- cgit v1.1