OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: Remove unused message from the asset server configuration

0.6.0-stable
Justin Clarke Casey 2008-08-09 20:30:56 +00:00
parent 52d5369a87
commit f1c897695b
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/AssetConfig.cs
View File

@ -39,7 +39,6 @@ namespace OpenSim.Framework
private ConfigurationMember configMember; private ConfigurationMember configMember;
public string DatabaseConnect = String.Empty; public string DatabaseConnect = String.Empty;
public string DatabaseProvider = String.Empty; public string DatabaseProvider = String.Empty;
public string DefaultStartupMsg = String.Empty;
public uint HttpPort = DefaultHttpPort; public uint HttpPort = DefaultHttpPort;
public AssetConfig(string description, string filename) public AssetConfig(string description, string filename)
@ -51,10 +50,6 @@ namespace OpenSim.Framework
public void loadConfigurationOptions() 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, configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for database provider", "OpenSim.Data.MySQL.dll", false); "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
@ -69,9 +64,6 @@ namespace OpenSim.Framework
{ {
switch (configuration_key) switch (configuration_key)
{ {
case "default_startup_message":
DefaultStartupMsg = (string) configuration_result;
break;
case "database_provider": case "database_provider":
DatabaseProvider = (string) configuration_result; DatabaseProvider = (string) configuration_result;
break; break;

8
OpenSim/Grid/AssetServer/Main.cs
View File

@ -46,8 +46,6 @@ namespace OpenSim.Grid.AssetServer
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public AssetConfig m_config;
public static OpenAsset_Main assetserver; public static OpenAsset_Main assetserver;
// Temporarily hardcoded - should be a plugin // Temporarily hardcoded - should be a plugin
@ -87,16 +85,16 @@ namespace OpenSim.Grid.AssetServer
{ {
base.Startup(); 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"); m_log.Info("[ASSET]: Setting up asset DB");
setupDB(m_config); setupDB(config);
m_log.Info("[ASSET]: Loading default asset set.."); m_log.Info("[ASSET]: Loading default asset set..");
LoadDefaultAssets(); LoadDefaultAssets();
m_log.Info("[ASSET]: Starting HTTP process"); m_log.Info("[ASSET]: Starting HTTP process");
m_httpServer = new BaseHttpServer(m_config.HttpPort); m_httpServer = new BaseHttpServer(config.HttpPort);
m_stats = StatsManager.StartCollectingAssetStats(); m_stats = StatsManager.StartCollectingAssetStats();