aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AssetConfig.cs8
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs8
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
39 private ConfigurationMember configMember; 39 private ConfigurationMember configMember;
40 public string DatabaseConnect = String.Empty; 40 public string DatabaseConnect = String.Empty;
41 public string DatabaseProvider = String.Empty; 41 public string DatabaseProvider = String.Empty;
42 public string DefaultStartupMsg = String.Empty;
43 public uint HttpPort = DefaultHttpPort; 42 public uint HttpPort = DefaultHttpPort;
44 43
45 public AssetConfig(string description, string filename) 44 public AssetConfig(string description, string filename)
@@ -51,10 +50,6 @@ namespace OpenSim.Framework
51 50
52 public void loadConfigurationOptions() 51 public void loadConfigurationOptions()
53 { 52 {
54 configMember.addConfigurationOption("default_startup_message",
55 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
56 "Default Startup Message", "Welcome to OGS", false);
57
58 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 53 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
59 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 54 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
60 55
@@ -69,9 +64,6 @@ namespace OpenSim.Framework
69 { 64 {
70 switch (configuration_key) 65 switch (configuration_key)
71 { 66 {
72 case "default_startup_message":
73 DefaultStartupMsg = (string) configuration_result;
74 break;
75 case "database_provider": 67 case "database_provider":
76 DatabaseProvider = (string) configuration_result; 68 DatabaseProvider = (string) configuration_result;
77 break; 69 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
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 public AssetConfig m_config;
50
51 public static OpenAsset_Main assetserver; 49 public static OpenAsset_Main assetserver;
52 50
53 // Temporarily hardcoded - should be a plugin 51 // Temporarily hardcoded - should be a plugin
@@ -87,16 +85,16 @@ namespace OpenSim.Grid.AssetServer
87 { 85 {
88 base.Startup(); 86 base.Startup();
89 87
90 m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml"))); 88 AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
91 89
92 m_log.Info("[ASSET]: Setting up asset DB"); 90 m_log.Info("[ASSET]: Setting up asset DB");
93 setupDB(m_config); 91 setupDB(config);
94 92
95 m_log.Info("[ASSET]: Loading default asset set.."); 93 m_log.Info("[ASSET]: Loading default asset set..");
96 LoadDefaultAssets(); 94 LoadDefaultAssets();
97 95
98 m_log.Info("[ASSET]: Starting HTTP process"); 96 m_log.Info("[ASSET]: Starting HTTP process");
99 m_httpServer = new BaseHttpServer(m_config.HttpPort); 97 m_httpServer = new BaseHttpServer(config.HttpPort);
100 98
101 m_stats = StatsManager.StartCollectingAssetStats(); 99 m_stats = StatsManager.StartCollectingAssetStats();
102 100