From bbe1e196963fe8609a1070793b8439c293261d24 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 17 Apr 2009 05:52:46 +0000
Subject: * Some more work on refactoring configs;   * Moved the constants out
 into a separate DefaultConfig   * Pulled configMember up   * Some minor CCC

---
 OpenSim/Framework/AssetConfig.cs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Framework/AssetConfig.cs')

diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 804a270..f9e6954 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -35,33 +35,30 @@ namespace OpenSim.Framework
     /// </summary>
     public class AssetConfig:ConfigBase
     {
-        public const uint DefaultHttpPort = 8003;
-
-        private ConfigurationMember configMember;
         public string DatabaseConnect = String.Empty;
         public string DatabaseProvider = String.Empty;
-        public uint HttpPort = DefaultHttpPort;
+        public uint HttpPort = DefaultSettings.DefaultAssetServerHttpPort;
         public string AssetSetsLocation = string.Empty;
 
         public AssetConfig(string description, string filename)
         {
-            configMember =
+            m_configMember =
                 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
-            configMember.performConfigurationRetrieve();
+            m_configMember.performConfigurationRetrieve();
         }
 
         public void loadConfigurationOptions()
         {
-            configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+            m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
 
-            configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+            m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Database connection string", "", false);
 
-            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", DefaultHttpPort.ToString(), false);
+            m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Http Listener port", DefaultSettings.DefaultAssetServerHttpPort.ToString(), false);
 
-            configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+            m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                         "Location of 'AssetSets.xml'",
                                         string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar), false);
         }
-- 
cgit v1.1