From f1c897695b76087738cc014b0ad7cf386d2ae448 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 9 Aug 2008 20:30:56 +0000
Subject: * minor: Remove unused message from the asset server configuration

---
 OpenSim/Framework/AssetConfig.cs | 8 --------
 OpenSim/Grid/AssetServer/Main.cs | 8 +++-----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index dc73f37..9ae98d7 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -39,7 +39,6 @@ namespace OpenSim.Framework
         private ConfigurationMember configMember;
         public string DatabaseConnect = String.Empty;
         public string DatabaseProvider = String.Empty;
-        public string DefaultStartupMsg = String.Empty;
         public uint HttpPort = DefaultHttpPort;
 
         public AssetConfig(string description, string filename)
@@ -51,10 +50,6 @@ namespace OpenSim.Framework
 
         public void loadConfigurationOptions()
         {
-            configMember.addConfigurationOption("default_startup_message",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default Startup Message", "Welcome to OGS", false);
-
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
 
@@ -69,9 +64,6 @@ namespace OpenSim.Framework
         {
             switch (configuration_key)
             {
-                case "default_startup_message":
-                    DefaultStartupMsg = (string) configuration_result;
-                    break;
                 case "database_provider":
                     DatabaseProvider = (string) configuration_result;
                     break;
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 7c7e39b..9e69257 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -46,8 +46,6 @@ namespace OpenSim.Grid.AssetServer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public AssetConfig m_config;
-
         public static OpenAsset_Main assetserver;
 
         // Temporarily hardcoded - should be a plugin
@@ -87,16 +85,16 @@ namespace OpenSim.Grid.AssetServer
         {
             base.Startup();
             
-            m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
+            AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
 
             m_log.Info("[ASSET]: Setting up asset DB");
-            setupDB(m_config);
+            setupDB(config);
 
             m_log.Info("[ASSET]: Loading default asset set..");
             LoadDefaultAssets();
 
             m_log.Info("[ASSET]: Starting HTTP process");
-            m_httpServer = new BaseHttpServer(m_config.HttpPort);
+            m_httpServer = new BaseHttpServer(config.HttpPort);
 
             m_stats = StatsManager.StartCollectingAssetStats();
 
-- 
cgit v1.1