From 3c90d834eac382af5edf091e83aea1ffcce91792 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 10 Jan 2010 22:41:42 +0000 Subject: Remove all references to master avatar, replacing with estate owner where appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. --- OpenSim/Framework/RegionInfo.cs | 96 ----------------------------------------- 1 file changed, 96 deletions(-) (limited to 'OpenSim/Framework/RegionInfo.cs') diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 88b62e0..0a826a6 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -54,10 +54,6 @@ namespace OpenSim.Framework private RegionSettings m_regionSettings; // private IConfigSource m_configSource = null; - public UUID MasterAvatarAssignedUUID = UUID.Zero; - public string MasterAvatarFirstName = String.Empty; - public string MasterAvatarLastName = String.Empty; - public string MasterAvatarSandboxPassword = String.Empty; public UUID originRegionID = UUID.Zero; public string proxyUrl = ""; public int ProxyOffset = 0; @@ -488,40 +484,6 @@ namespace OpenSim.Framework m_externalHostName = externalName; - // Master avatar cruft - // - string masterAvatarUUID; - if (!creatingNew) - { - masterAvatarUUID = config.GetString("MasterAvatarUUID", UUID.Zero.ToString()); - MasterAvatarFirstName = config.GetString("MasterAvatarFirstName", String.Empty); - MasterAvatarLastName = config.GetString("MasterAvatarLastName", String.Empty); - MasterAvatarSandboxPassword = config.GetString("MasterAvatarSandboxPassword", String.Empty); - } - else - { - masterAvatarUUID = MainConsole.Instance.CmdPrompt("Master Avatar UUID", UUID.Zero.ToString()); - if (masterAvatarUUID != UUID.Zero.ToString()) - { - config.Set("MasterAvatarUUID", masterAvatarUUID); - } - else - { - MasterAvatarFirstName = MainConsole.Instance.CmdPrompt("Master Avatar first name (enter for no master avatar)", String.Empty); - if (MasterAvatarFirstName != String.Empty) - { - MasterAvatarLastName = MainConsole.Instance.CmdPrompt("Master Avatar last name", String.Empty); - MasterAvatarSandboxPassword = MainConsole.Instance.CmdPrompt("Master Avatar sandbox password", String.Empty); - - config.Set("MasterAvatarFirstName", MasterAvatarFirstName); - config.Set("MasterAvatarLastName", MasterAvatarLastName); - config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword); - } - } - } - - MasterAvatarAssignedUUID = new UUID(masterAvatarUUID); - m_regionType = config.GetString("RegionType", String.Empty); // Prim stuff @@ -564,20 +526,6 @@ namespace OpenSim.Framework config.Set("ExternalHostName", m_externalHostName); - if (MasterAvatarAssignedUUID != UUID.Zero) - { - config.Set("MasterAvatarUUID", MasterAvatarAssignedUUID.ToString()); - } - else if (MasterAvatarFirstName != String.Empty && MasterAvatarLastName != String.Empty) - { - config.Set("MasterAvatarFirstName", MasterAvatarFirstName); - config.Set("MasterAvatarLastName", MasterAvatarLastName); - } - if (MasterAvatarSandboxPassword != String.Empty) - { - config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword); - } - if (m_nonphysPrimMax != 0) config.Set("NonphysicalPrimMax", m_nonphysPrimMax); if (m_physPrimMax != 0) @@ -651,17 +599,6 @@ namespace OpenSim.Framework configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", m_externalHostName, true); - configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID, - "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true); - configMember.addConfigurationOption("master_avatar_first", - ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, - "First Name of Master Avatar", MasterAvatarFirstName, true); - configMember.addConfigurationOption("master_avatar_last", - ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, - "Last Name of Master Avatar", MasterAvatarLastName, true); - configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, - "(Sandbox Mode Only)Password for Master Avatar account", - MasterAvatarSandboxPassword, true); configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID, "Last Map UUID", lastMapUUID.ToString(), true); configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, @@ -711,22 +648,6 @@ namespace OpenSim.Framework configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); - configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID, - "Master Avatar UUID", UUID.Zero.ToString(), true); - configMember.addConfigurationOption("master_avatar_first", - ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, - "First Name of Master Avatar", "Test", false, - (ConfigurationOption.ConfigurationOptionShouldBeAsked) - shouldMasterAvatarDetailsBeAsked); - configMember.addConfigurationOption("master_avatar_last", - ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, - "Last Name of Master Avatar", "User", false, - (ConfigurationOption.ConfigurationOptionShouldBeAsked) - shouldMasterAvatarDetailsBeAsked); - configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, - "(Sandbox Mode Only)Password for Master Avatar account", "test", false, - (ConfigurationOption.ConfigurationOptionShouldBeAsked) - shouldMasterAvatarDetailsBeAsked); configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID, "Last Map UUID", lastMapUUID.ToString(), true); @@ -752,11 +673,6 @@ namespace OpenSim.Framework "Region Type", String.Empty, true); } - public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) - { - return MasterAvatarAssignedUUID == UUID.Zero; - } - public bool handleIncomingConfiguration(string configuration_key, object configuration_result) { switch (configuration_key) @@ -797,18 +713,6 @@ namespace OpenSim.Framework m_externalHostName = Util.GetLocalHost().ToString(); } break; - case "master_avatar_uuid": - MasterAvatarAssignedUUID = (UUID) configuration_result; - break; - case "master_avatar_first": - MasterAvatarFirstName = (string) configuration_result; - break; - case "master_avatar_last": - MasterAvatarLastName = (string) configuration_result; - break; - case "master_avatar_pass": - MasterAvatarSandboxPassword = (string)configuration_result; - break; case "lastmap_uuid": lastMapUUID = (UUID)configuration_result; break; -- cgit v1.1 From c62a6adb2b234fcbe99e352f4bd2af0cbf683a99 Mon Sep 17 00:00:00 2001 From: dahlia Date: Wed, 17 Feb 2010 19:56:30 -0800 Subject: change "SYSTEMIP" to "localhost" in the create region console command prompt --- OpenSim/Framework/RegionInfo.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Framework/RegionInfo.cs') diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 88b62e0..ee5dd37 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -474,15 +474,15 @@ namespace OpenSim.Framework if (config.Contains("ExternalHostName")) { - externalName = config.GetString("ExternalHostName", "SYSTEMIP"); + externalName = config.GetString("ExternalHostName", "localhost"); } else { - externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP"); + externalName = MainConsole.Instance.CmdPrompt("External host name", "localhost"); config.Set("ExternalHostName", externalName); } - if (externalName == "SYSTEMIP") + if (externalName == "localhost") m_externalHostName = Util.GetLocalHost().ToString(); else m_externalHostName = externalName; @@ -788,7 +788,7 @@ namespace OpenSim.Framework m_allow_alternate_ports = (bool) configuration_result; break; case "external_host_name": - if ((string) configuration_result != "SYSTEMIP") + if ((string) configuration_result != "localhost") { m_externalHostName = (string) configuration_result; } -- cgit v1.1 From 92f8f3e9d278455aca1e36e40c58ac529069bdef Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 18 Feb 2010 03:31:06 +0000 Subject: Revert "change "SYSTEMIP" to "localhost" in the create region console command prompt" after speaking to Dahlia This reverts commit c62a6adb2b234fcbe99e352f4bd2af0cbf683a99. --- OpenSim/Framework/RegionInfo.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Framework/RegionInfo.cs') diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index ee5dd37..88b62e0 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -474,15 +474,15 @@ namespace OpenSim.Framework if (config.Contains("ExternalHostName")) { - externalName = config.GetString("ExternalHostName", "localhost"); + externalName = config.GetString("ExternalHostName", "SYSTEMIP"); } else { - externalName = MainConsole.Instance.CmdPrompt("External host name", "localhost"); + externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP"); config.Set("ExternalHostName", externalName); } - if (externalName == "localhost") + if (externalName == "SYSTEMIP") m_externalHostName = Util.GetLocalHost().ToString(); else m_externalHostName = externalName; @@ -788,7 +788,7 @@ namespace OpenSim.Framework m_allow_alternate_ports = (bool) configuration_result; break; case "external_host_name": - if ((string) configuration_result != "localhost") + if ((string) configuration_result != "SYSTEMIP") { m_externalHostName = (string) configuration_result; } -- cgit v1.1 From 842b68eeff7571d3c82415c65065bec3c95f34ea Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 18 Feb 2010 04:19:33 +0000 Subject: Change handling of the SYSTEMIP constant to be more sane. This will now choose the first network interface IP address, or the loopback interface if no external interfaces are found. It will log the IP address used as [NETWORK]: Using x.x.x.x for SYSTEMIP. --- OpenSim/Framework/RegionInfo.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'OpenSim/Framework/RegionInfo.cs') diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 88b62e0..baef32a 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -487,7 +487,6 @@ namespace OpenSim.Framework else m_externalHostName = externalName; - // Master avatar cruft // string masterAvatarUUID; -- cgit v1.1