aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/InventoryConfig.cs12
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs11
2 files changed, 5 insertions, 18 deletions
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index a6855d3..ef8a28a 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -41,8 +41,6 @@ namespace OpenSim.Framework
41 public string DatabaseProvider = String.Empty; 41 public string DatabaseProvider = String.Empty;
42 public string DefaultStartupMsg = String.Empty; 42 public string DefaultStartupMsg = String.Empty;
43 public uint HttpPort = DefaultHttpPort; 43 public uint HttpPort = DefaultHttpPort;
44 public string UserRecvKey = String.Empty;
45 public string UserSendKey = String.Empty;
46 public string UserServerURL = String.Empty; 44 public string UserServerURL = String.Empty;
47 public bool SessionLookUp = true; 45 public bool SessionLookUp = true;
48 46
@@ -59,10 +57,6 @@ namespace OpenSim.Framework
59 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 57 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
60 "Default User Server URI", 58 "Default User Server URI",
61 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false); 59 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false);
62 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
63 "Key to send to user server", "null", false);
64 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
65 "Key to expect from user server", "null", false);
66 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 60 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
67 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 61 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
68 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 62 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -80,12 +74,6 @@ namespace OpenSim.Framework
80 case "default_user_server": 74 case "default_user_server":
81 UserServerURL = (string) configuration_result; 75 UserServerURL = (string) configuration_result;
82 break; 76 break;
83 case "user_send_key":
84 UserSendKey = (string) configuration_result;
85 break;
86 case "user_recv_key":
87 UserRecvKey = (string) configuration_result;
88 break;
89 case "database_provider": 77 case "database_provider":
90 DatabaseProvider = (string) configuration_result; 78 DatabaseProvider = (string) configuration_result;
91 break; 79 break;
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index fda1c96..f62bdf5 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -42,7 +42,6 @@ namespace OpenSim.Grid.InventoryServer
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 private InventoryConfig m_config;
46 private GridInventoryService m_inventoryService; 45 private GridInventoryService m_inventoryService;
47 46
48 public const string LogName = "INVENTORY"; 47 public const string LogName = "INVENTORY";
@@ -68,15 +67,15 @@ namespace OpenSim.Grid.InventoryServer
68 { 67 {
69 base.Startup(); 68 base.Startup();
70 69
71 m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); 70 InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
72 71
73 m_inventoryService = new GridInventoryService(m_config.UserServerURL); 72 m_inventoryService = new GridInventoryService(config.UserServerURL);
74 m_inventoryService.DoLookup = m_config.SessionLookUp; 73 m_inventoryService.DoLookup = config.SessionLookUp;
75 m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); 74 m_inventoryService.AddPlugin(config.DatabaseProvider, config.DatabaseConnect);
76 75
77 m_log.Info("[" + LogName + "]: Starting HTTP server ..."); 76 m_log.Info("[" + LogName + "]: Starting HTTP server ...");
78 77
79 m_httpServer = new BaseHttpServer(m_config.HttpPort); 78 m_httpServer = new BaseHttpServer(config.HttpPort);
80 AddHttpHandlers(); 79 AddHttpHandlers();
81 m_httpServer.Start(); 80 m_httpServer.Start();
82 81