aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs97
1 files changed, 0 insertions, 97 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 1ea08f9..828bbfc 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -341,10 +341,6 @@ namespace OpenSim.Framework
341 private RegionSettings m_regionSettings; 341 private RegionSettings m_regionSettings;
342 // private IConfigSource m_configSource = null; 342 // private IConfigSource m_configSource = null;
343 343
344 public UUID MasterAvatarAssignedUUID = UUID.Zero;
345 public string MasterAvatarFirstName = String.Empty;
346 public string MasterAvatarLastName = String.Empty;
347 public string MasterAvatarSandboxPassword = String.Empty;
348 public UUID originRegionID = UUID.Zero; 344 public UUID originRegionID = UUID.Zero;
349 public string proxyUrl = ""; 345 public string proxyUrl = "";
350 public int ProxyOffset = 0; 346 public int ProxyOffset = 0;
@@ -790,41 +786,6 @@ namespace OpenSim.Framework
790 else 786 else
791 m_externalHostName = externalName; 787 m_externalHostName = externalName;
792 788
793
794 // Master avatar cruft
795 //
796 string masterAvatarUUID;
797 if (!creatingNew)
798 {
799 masterAvatarUUID = config.GetString("MasterAvatarUUID", UUID.Zero.ToString());
800 MasterAvatarFirstName = config.GetString("MasterAvatarFirstName", String.Empty);
801 MasterAvatarLastName = config.GetString("MasterAvatarLastName", String.Empty);
802 MasterAvatarSandboxPassword = config.GetString("MasterAvatarSandboxPassword", String.Empty);
803 }
804 else
805 {
806 masterAvatarUUID = MainConsole.Instance.CmdPrompt("Master Avatar UUID", UUID.Zero.ToString());
807 if (masterAvatarUUID != UUID.Zero.ToString())
808 {
809 config.Set("MasterAvatarUUID", masterAvatarUUID);
810 }
811 else
812 {
813 MasterAvatarFirstName = MainConsole.Instance.CmdPrompt("Master Avatar first name (enter for no master avatar)", String.Empty);
814 if (MasterAvatarFirstName != String.Empty)
815 {
816 MasterAvatarLastName = MainConsole.Instance.CmdPrompt("Master Avatar last name", String.Empty);
817 MasterAvatarSandboxPassword = MainConsole.Instance.CmdPrompt("Master Avatar sandbox password", String.Empty);
818
819 config.Set("MasterAvatarFirstName", MasterAvatarFirstName);
820 config.Set("MasterAvatarLastName", MasterAvatarLastName);
821 config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword);
822 }
823 }
824 }
825
826 MasterAvatarAssignedUUID = new UUID(masterAvatarUUID);
827
828 m_regionType = config.GetString("RegionType", String.Empty); 789 m_regionType = config.GetString("RegionType", String.Empty);
829 790
830 // Prim stuff 791 // Prim stuff
@@ -867,20 +828,6 @@ namespace OpenSim.Framework
867 828
868 config.Set("ExternalHostName", m_externalHostName); 829 config.Set("ExternalHostName", m_externalHostName);
869 830
870 if (MasterAvatarAssignedUUID != UUID.Zero)
871 {
872 config.Set("MasterAvatarUUID", MasterAvatarAssignedUUID.ToString());
873 }
874 else if (MasterAvatarFirstName != String.Empty && MasterAvatarLastName != String.Empty)
875 {
876 config.Set("MasterAvatarFirstName", MasterAvatarFirstName);
877 config.Set("MasterAvatarLastName", MasterAvatarLastName);
878 }
879 if (MasterAvatarSandboxPassword != String.Empty)
880 {
881 config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword);
882 }
883
884 if (m_nonphysPrimMax != 0) 831 if (m_nonphysPrimMax != 0)
885 config.Set("NonphysicalPrimMax", m_nonphysPrimMax); 832 config.Set("NonphysicalPrimMax", m_nonphysPrimMax);
886 if (m_physPrimMax != 0) 833 if (m_physPrimMax != 0)
@@ -954,17 +901,6 @@ namespace OpenSim.Framework
954 configMember.addConfigurationOption("external_host_name", 901 configMember.addConfigurationOption("external_host_name",
955 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 902 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
956 "External Host Name", m_externalHostName, true); 903 "External Host Name", m_externalHostName, true);
957 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
958 "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true);
959 configMember.addConfigurationOption("master_avatar_first",
960 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
961 "First Name of Master Avatar", MasterAvatarFirstName, true);
962 configMember.addConfigurationOption("master_avatar_last",
963 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
964 "Last Name of Master Avatar", MasterAvatarLastName, true);
965 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
966 "(Sandbox Mode Only)Password for Master Avatar account",
967 MasterAvatarSandboxPassword, true);
968 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 904 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
969 "Last Map UUID", lastMapUUID.ToString(), true); 905 "Last Map UUID", lastMapUUID.ToString(), true);
970 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 906 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -1014,22 +950,6 @@ namespace OpenSim.Framework
1014 configMember.addConfigurationOption("external_host_name", 950 configMember.addConfigurationOption("external_host_name",
1015 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 951 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
1016 "External Host Name", "127.0.0.1", false); 952 "External Host Name", "127.0.0.1", false);
1017 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
1018 "Master Avatar UUID", UUID.Zero.ToString(), true);
1019 configMember.addConfigurationOption("master_avatar_first",
1020 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
1021 "First Name of Master Avatar", "Test", false,
1022 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
1023 shouldMasterAvatarDetailsBeAsked);
1024 configMember.addConfigurationOption("master_avatar_last",
1025 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
1026 "Last Name of Master Avatar", "User", false,
1027 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
1028 shouldMasterAvatarDetailsBeAsked);
1029 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
1030 "(Sandbox Mode Only)Password for Master Avatar account", "test", false,
1031 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
1032 shouldMasterAvatarDetailsBeAsked);
1033 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 953 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
1034 "Last Map UUID", lastMapUUID.ToString(), true); 954 "Last Map UUID", lastMapUUID.ToString(), true);
1035 955
@@ -1055,11 +975,6 @@ namespace OpenSim.Framework
1055 "Region Type", String.Empty, true); 975 "Region Type", String.Empty, true);
1056 } 976 }
1057 977
1058 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
1059 {
1060 return MasterAvatarAssignedUUID == UUID.Zero;
1061 }
1062
1063 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 978 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
1064 { 979 {
1065 switch (configuration_key) 980 switch (configuration_key)
@@ -1100,18 +1015,6 @@ namespace OpenSim.Framework
1100 m_externalHostName = Util.GetLocalHost().ToString(); 1015 m_externalHostName = Util.GetLocalHost().ToString();
1101 } 1016 }
1102 break; 1017 break;
1103 case "master_avatar_uuid":
1104 MasterAvatarAssignedUUID = (UUID) configuration_result;
1105 break;
1106 case "master_avatar_first":
1107 MasterAvatarFirstName = (string) configuration_result;
1108 break;
1109 case "master_avatar_last":
1110 MasterAvatarLastName = (string) configuration_result;
1111 break;
1112 case "master_avatar_pass":
1113 MasterAvatarSandboxPassword = (string)configuration_result;
1114 break;
1115 case "lastmap_uuid": 1018 case "lastmap_uuid":
1116 lastMapUUID = (UUID)configuration_result; 1019 lastMapUUID = (UUID)configuration_result;
1117 break; 1020 break;
generated by cgit v1.1 at 2024-12-22 08:29:58 +0000