From 52d5369a87d49279c1632d062f27ffed5ff8d843 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 9 Aug 2008 19:59:01 +0000
Subject: * minor: get rid of send and receive keys from inventory server *
 these are not used

---
 OpenSim/Framework/InventoryConfig.cs | 12 ------------
 OpenSim/Grid/InventoryServer/Main.cs | 11 +++++------
 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
         public string DatabaseProvider = String.Empty;
         public string DefaultStartupMsg = String.Empty;
         public uint HttpPort = DefaultHttpPort;
-        public string UserRecvKey = String.Empty;
-        public string UserSendKey = String.Empty;
         public string UserServerURL = String.Empty;
         public bool SessionLookUp = true;
 
@@ -59,10 +57,6 @@ namespace OpenSim.Framework
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default User Server URI",
                                                 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false);
-            configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to send to user server", "null", false);
-            configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to expect from user server", "null", false);
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
             configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -80,12 +74,6 @@ namespace OpenSim.Framework
                 case "default_user_server":
                     UserServerURL = (string) configuration_result;
                     break;
-                case "user_send_key":
-                    UserSendKey = (string) configuration_result;
-                    break;
-                case "user_recv_key":
-                    UserRecvKey = (string) configuration_result;
-                    break;
                 case "database_provider":
                     DatabaseProvider = (string) configuration_result;
                     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
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private InventoryConfig m_config;
         private GridInventoryService m_inventoryService;
 
         public const string LogName = "INVENTORY";
@@ -68,15 +67,15 @@ namespace OpenSim.Grid.InventoryServer
         {
             base.Startup();
             
-            m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
+            InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
 
-            m_inventoryService = new GridInventoryService(m_config.UserServerURL);
-            m_inventoryService.DoLookup = m_config.SessionLookUp;
-            m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
+            m_inventoryService = new GridInventoryService(config.UserServerURL);
+            m_inventoryService.DoLookup = config.SessionLookUp;
+            m_inventoryService.AddPlugin(config.DatabaseProvider, config.DatabaseConnect);
 
             m_log.Info("[" + LogName + "]: Starting HTTP server ...");
 
-            m_httpServer = new BaseHttpServer(m_config.HttpPort);
+            m_httpServer = new BaseHttpServer(config.HttpPort);
             AddHttpHandlers();
             m_httpServer.Start();
 
-- 
cgit v1.1