Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.

1 files changed, 0 insertions, 11 deletions

diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs
index 16a7de4..776b911 100644
--- a/OpenSim/Framework/General/Configuration/UserConfig.cs
+++ b/OpenSim/Framework/General/Configuration/UserConfig.cs
@@ -18,9 +18,6 @@ namespace OpenSim.Framework.Configuration
 
         public uint HttpPort = 8002;
 
-        public int    InventoryServerPort;
-        public string InventoryServerName;
-
         private ConfigurationMember configMember;
 
         public UserConfig(string description, string filename)
@@ -40,8 +37,6 @@ namespace OpenSim.Framework.Configuration
 
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false);
 
-            configMember.addConfigurationOption("inventory_server_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Portnumber inventory is listening on", "8004", false);
-            configMember.addConfigurationOption("inventory_server_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DNS name of the inventory server", "127.0.0.1", false);
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -64,12 +59,6 @@ namespace OpenSim.Framework.Configuration
                     this.DatabaseProvider = (string)configuration_result;
                     break;
 
-                case "inventory_server_port":
-                    this.InventoryServerPort = (int)configuration_result;
-                    break;
-                case "inventory_server_name":
-                    this.InventoryServerName = (string)configuration_result;
-                    break;
                 case "http_port":
                     HttpPort = (uint)configuration_result;
                     break;