From 863195612bdef56165f2b4354bab280c371618b9 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 27 Sep 2007 14:57:43 +0000 Subject: Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445. --- .../General/Configuration/InventoryConfig.cs | 67 ---------------------- .../Framework/General/Configuration/UserConfig.cs | 11 ---- .../Framework/General/Types/NetworkServersInfo.cs | 5 +- OpenSim/Framework/General/Types/UUID.cs | 4 +- 4 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 OpenSim/Framework/General/Configuration/InventoryConfig.cs (limited to 'OpenSim/Framework/General') diff --git a/OpenSim/Framework/General/Configuration/InventoryConfig.cs b/OpenSim/Framework/General/Configuration/InventoryConfig.cs deleted file mode 100644 index d84609b..0000000 --- a/OpenSim/Framework/General/Configuration/InventoryConfig.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace OpenSim.Framework.Configuration -{ - /// - /// UserConfig -- For User Server Configuration - /// - public class InventoryConfig - { - public string DefaultStartupMsg = ""; - public string UserServerURL = ""; - public string UserSendKey = ""; - public string UserRecvKey = ""; - - public string DatabaseProvider = ""; - - public int RemotingPort = 8004; - - private ConfigurationMember configMember; - - public InventoryConfig(string description, string filename) - { - configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); - configMember.performConfigurationRetrieve(); - } - - 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", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", 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.Framework.Data.MySQL.dll", false); - configMember.addConfigurationOption("remoting_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Remoting Listener port", "8004", false); - - } - - public bool handleIncomingConfiguration(string configuration_key, object configuration_result) - { - switch (configuration_key) - { - case "default_startup_message": - this.DefaultStartupMsg = (string)configuration_result; - break; - case "default_user_server": - this.UserServerURL = (string)configuration_result; - break; - case "user_send_key": - this.UserSendKey = (string)configuration_result; - break; - case "user_recv_key": - this.UserRecvKey = (string)configuration_result; - break; - case "database_provider": - this.DatabaseProvider = (string)configuration_result; - break; - case "remoting_port": - RemotingPort = (int)configuration_result; - break; - } - - return true; - } - } -} 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; diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index cf194fc..b65488a 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs @@ -49,8 +49,6 @@ namespace OpenSim.Framework.Types public int HttpListenerPort = 9000; public int RemotingListenerPort = 8895; - public int InventoryServerPort; - public string InventoryServerName = ""; public NetworkServersInfo() { @@ -88,8 +86,7 @@ namespace OpenSim.Framework.Types UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003"); - InventoryServerPort = config.Configs["Network"].GetInt("inventory_server_port", 8004); - InventoryServerName = config.Configs["Network"].GetString("inventory_server_name", "127.0.0.1"); + } } } diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs index feae4ae..9e9654d 100644 --- a/OpenSim/Framework/General/Types/UUID.cs +++ b/OpenSim/Framework/General/Types/UUID.cs @@ -91,12 +91,12 @@ namespace OpenSim.Framework.Types public void Combine(UUID other) { - LLUUID.Combine(llUUID, other.GetLLUUID()); + llUUID.Combine(other.GetLLUUID()); } public void Combine(LLUUID other) { - LLUUID.Combine(llUUID, other); + llUUID.Combine(other); } public override bool Equals(Object other) -- cgit v1.1