aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetConfig.cs
diff options
context:
space:
mode:
authorlbsa712009-04-17 15:09:37 +0000
committerlbsa712009-04-17 15:09:37 +0000
commita189da844a1ec48b321674f49a81c4e0a71c8b81 (patch)
treeeb55b24007c0f221a7d9f84bdbb12282d161c777 /OpenSim/Framework/AssetConfig.cs
parent* remind me to never touch EstateSettings ever again. Ever. (diff)
downloadopensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.zip
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.gz
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.bz2
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.xz
* Moved the DefaultConfig settings into already-existing ConfigSettings
Diffstat (limited to 'OpenSim/Framework/AssetConfig.cs')
-rw-r--r--OpenSim/Framework/AssetConfig.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index f9e6954..2c2e327 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 { 37 {
38 public string DatabaseConnect = String.Empty; 38 public string DatabaseConnect = String.Empty;
39 public string DatabaseProvider = String.Empty; 39 public string DatabaseProvider = String.Empty;
40 public uint HttpPort = DefaultSettings.DefaultAssetServerHttpPort; 40 public uint HttpPort = ConfigSettings.DefaultAssetServerHttpPort;
41 public string AssetSetsLocation = string.Empty; 41 public string AssetSetsLocation = string.Empty;
42 42
43 public AssetConfig(string description, string filename) 43 public AssetConfig(string description, string filename)
@@ -56,7 +56,7 @@ namespace OpenSim.Framework
56 "Database connection string", "", false); 56 "Database connection string", "", false);
57 57
58 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 58 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
59 "Http Listener port", DefaultSettings.DefaultAssetServerHttpPort.ToString(), false); 59 "Http Listener port", ConfigSettings.DefaultAssetServerHttpPort.ToString(), false);
60 60
61 m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 61 m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
62 "Location of 'AssetSets.xml'", 62 "Location of 'AssetSets.xml'",