aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/InventoryConfig.cs10
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs1
2 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 66719c6..eeed3d2 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -30,7 +30,7 @@ using System;
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 /// <summary> 32 /// <summary>
33 /// UserConfig -- For User Server Configuration 33 /// Defines and handles inventory grid server configuration
34 /// </summary> 34 /// </summary>
35 public class InventoryConfig 35 public class InventoryConfig
36 { 36 {
@@ -55,9 +55,6 @@ namespace OpenSim.Framework
55 55
56 public void loadConfigurationOptions() 56 public void loadConfigurationOptions()
57 { 57 {
58 configMember.addConfigurationOption("default_startup_message",
59 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
60 "Default Startup Message", "Welcome to OGS", false);
61 configMember.addConfigurationOption("default_user_server", 58 configMember.addConfigurationOption("default_user_server",
62 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 59 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
63 "Default User Server URI", 60 "Default User Server URI",
@@ -73,16 +70,13 @@ namespace OpenSim.Framework
73 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 70 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
74 "Http Listener port", DefaultHttpPort.ToString(), false); 71 "Http Listener port", DefaultHttpPort.ToString(), false);
75 configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 72 configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
76 "Enable Session lookup security", "True", false); 73 "Enable session lookup security", "True", false);
77 } 74 }
78 75
79 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 76 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
80 { 77 {
81 switch (configuration_key) 78 switch (configuration_key)
82 { 79 {
83 case "default_startup_message":
84 DefaultStartupMsg = (string) configuration_result;
85 break;
86 case "default_user_server": 80 case "default_user_server":
87 UserServerURL = (string) configuration_result; 81 UserServerURL = (string) configuration_result;
88 break; 82 break;
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 67889ac..fda1c96 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -70,7 +70,6 @@ namespace OpenSim.Grid.InventoryServer
70 70
71 m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); 71 m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
72 72
73 //m_inventoryService = new GridInventoryService();
74 m_inventoryService = new GridInventoryService(m_config.UserServerURL); 73 m_inventoryService = new GridInventoryService(m_config.UserServerURL);
75 m_inventoryService.DoLookup = m_config.SessionLookUp; 74 m_inventoryService.DoLookup = m_config.SessionLookUp;
76 m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); 75 m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);