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

* minor: remove redundant welcome message from inventory grid server configuration

0.6.0-stable
Justin Clarke Casey 2008-08-09 17:40:48 +00:00
parent adfccd0ee0
commit 00473fcfee
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/InventoryConfig.cs
View File

@ -30,7 +30,7 @@ using System;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
/// <summary> /// <summary>
/// UserConfig -- For User Server Configuration /// Defines and handles inventory grid server configuration
/// </summary> /// </summary>
public class InventoryConfig public class InventoryConfig
{ {
@ -55,9 +55,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("default_user_server", configMember.addConfigurationOption("default_user_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default User Server URI", "Default User Server URI",
@ -73,16 +70,13 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultHttpPort.ToString(), false); "Http Listener port", DefaultHttpPort.ToString(), false);
configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
"Enable Session lookup security", "True", false); "Enable session lookup security", "True", false);
} }
public bool handleIncomingConfiguration(string configuration_key, object configuration_result) public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
{ {
switch (configuration_key) switch (configuration_key)
{ {
case "default_startup_message":
DefaultStartupMsg = (string) configuration_result;
break;
case "default_user_server": case "default_user_server":
UserServerURL = (string) configuration_result; UserServerURL = (string) configuration_result;
break; break;

1
OpenSim/Grid/InventoryServer/Main.cs
View File

@ -70,7 +70,6 @@ namespace OpenSim.Grid.InventoryServer
m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
//m_inventoryService = new GridInventoryService();
m_inventoryService = new GridInventoryService(m_config.UserServerURL); m_inventoryService = new GridInventoryService(m_config.UserServerURL);
m_inventoryService.DoLookup = m_config.SessionLookUp; m_inventoryService.DoLookup = m_config.SessionLookUp;
m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);