aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs96
1 files changed, 0 insertions, 96 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index baef32a..ac38ac2 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -54,10 +54,6 @@ namespace OpenSim.Framework
54 private RegionSettings m_regionSettings; 54 private RegionSettings m_regionSettings;
55 // private IConfigSource m_configSource = null; 55 // private IConfigSource m_configSource = null;
56 56
57 public UUID MasterAvatarAssignedUUID = UUID.Zero;
58 public string MasterAvatarFirstName = String.Empty;
59 public string MasterAvatarLastName = String.Empty;
60 public string MasterAvatarSandboxPassword = String.Empty;
61 public UUID originRegionID = UUID.Zero; 57 public UUID originRegionID = UUID.Zero;
62 public string proxyUrl = ""; 58 public string proxyUrl = "";
63 public int ProxyOffset = 0; 59 public int ProxyOffset = 0;
@@ -487,40 +483,6 @@ namespace OpenSim.Framework
487 else 483 else
488 m_externalHostName = externalName; 484 m_externalHostName = externalName;
489 485
490 // Master avatar cruft
491 //
492 string masterAvatarUUID;
493 if (!creatingNew)
494 {
495 masterAvatarUUID = config.GetString("MasterAvatarUUID", UUID.Zero.ToString());
496 MasterAvatarFirstName = config.GetString("MasterAvatarFirstName", String.Empty);
497 MasterAvatarLastName = config.GetString("MasterAvatarLastName", String.Empty);
498 MasterAvatarSandboxPassword = config.GetString("MasterAvatarSandboxPassword", String.Empty);
499 }
500 else
501 {
502 masterAvatarUUID = MainConsole.Instance.CmdPrompt("Master Avatar UUID", UUID.Zero.ToString());
503 if (masterAvatarUUID != UUID.Zero.ToString())
504 {
505 config.Set("MasterAvatarUUID", masterAvatarUUID);
506 }
507 else
508 {
509 MasterAvatarFirstName = MainConsole.Instance.CmdPrompt("Master Avatar first name (enter for no master avatar)", String.Empty);
510 if (MasterAvatarFirstName != String.Empty)
511 {
512 MasterAvatarLastName = MainConsole.Instance.CmdPrompt("Master Avatar last name", String.Empty);
513 MasterAvatarSandboxPassword = MainConsole.Instance.CmdPrompt("Master Avatar sandbox password", String.Empty);
514
515 config.Set("MasterAvatarFirstName", MasterAvatarFirstName);
516 config.Set("MasterAvatarLastName", MasterAvatarLastName);
517 config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword);
518 }
519 }
520 }
521
522 MasterAvatarAssignedUUID = new UUID(masterAvatarUUID);
523
524 m_regionType = config.GetString("RegionType", String.Empty); 486 m_regionType = config.GetString("RegionType", String.Empty);
525 487
526 // Prim stuff 488 // Prim stuff
@@ -563,20 +525,6 @@ namespace OpenSim.Framework
563 525
564 config.Set("ExternalHostName", m_externalHostName); 526 config.Set("ExternalHostName", m_externalHostName);
565 527
566 if (MasterAvatarAssignedUUID != UUID.Zero)
567 {
568 config.Set("MasterAvatarUUID", MasterAvatarAssignedUUID.ToString());
569 }
570 else if (MasterAvatarFirstName != String.Empty && MasterAvatarLastName != String.Empty)
571 {
572 config.Set("MasterAvatarFirstName", MasterAvatarFirstName);
573 config.Set("MasterAvatarLastName", MasterAvatarLastName);
574 }
575 if (MasterAvatarSandboxPassword != String.Empty)
576 {
577 config.Set("MasterAvatarSandboxPassword", MasterAvatarSandboxPassword);
578 }
579
580 if (m_nonphysPrimMax != 0) 528 if (m_nonphysPrimMax != 0)
581 config.Set("NonphysicalPrimMax", m_nonphysPrimMax); 529 config.Set("NonphysicalPrimMax", m_nonphysPrimMax);
582 if (m_physPrimMax != 0) 530 if (m_physPrimMax != 0)
@@ -650,17 +598,6 @@ namespace OpenSim.Framework
650 configMember.addConfigurationOption("external_host_name", 598 configMember.addConfigurationOption("external_host_name",
651 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 599 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
652 "External Host Name", m_externalHostName, true); 600 "External Host Name", m_externalHostName, true);
653 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
654 "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true);
655 configMember.addConfigurationOption("master_avatar_first",
656 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
657 "First Name of Master Avatar", MasterAvatarFirstName, true);
658 configMember.addConfigurationOption("master_avatar_last",
659 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
660 "Last Name of Master Avatar", MasterAvatarLastName, true);
661 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
662 "(Sandbox Mode Only)Password for Master Avatar account",
663 MasterAvatarSandboxPassword, true);
664 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 601 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
665 "Last Map UUID", lastMapUUID.ToString(), true); 602 "Last Map UUID", lastMapUUID.ToString(), true);
666 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 603 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -710,22 +647,6 @@ namespace OpenSim.Framework
710 configMember.addConfigurationOption("external_host_name", 647 configMember.addConfigurationOption("external_host_name",
711 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 648 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
712 "External Host Name", "127.0.0.1", false); 649 "External Host Name", "127.0.0.1", false);
713 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
714 "Master Avatar UUID", UUID.Zero.ToString(), true);
715 configMember.addConfigurationOption("master_avatar_first",
716 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
717 "First Name of Master Avatar", "Test", false,
718 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
719 shouldMasterAvatarDetailsBeAsked);
720 configMember.addConfigurationOption("master_avatar_last",
721 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
722 "Last Name of Master Avatar", "User", false,
723 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
724 shouldMasterAvatarDetailsBeAsked);
725 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
726 "(Sandbox Mode Only)Password for Master Avatar account", "test", false,
727 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
728 shouldMasterAvatarDetailsBeAsked);
729 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 650 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
730 "Last Map UUID", lastMapUUID.ToString(), true); 651 "Last Map UUID", lastMapUUID.ToString(), true);
731 652
@@ -751,11 +672,6 @@ namespace OpenSim.Framework
751 "Region Type", String.Empty, true); 672 "Region Type", String.Empty, true);
752 } 673 }
753 674
754 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
755 {
756 return MasterAvatarAssignedUUID == UUID.Zero;
757 }
758
759 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 675 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
760 { 676 {
761 switch (configuration_key) 677 switch (configuration_key)
@@ -796,18 +712,6 @@ namespace OpenSim.Framework
796 m_externalHostName = Util.GetLocalHost().ToString(); 712 m_externalHostName = Util.GetLocalHost().ToString();
797 } 713 }
798 break; 714 break;
799 case "master_avatar_uuid":
800 MasterAvatarAssignedUUID = (UUID) configuration_result;
801 break;
802 case "master_avatar_first":
803 MasterAvatarFirstName = (string) configuration_result;
804 break;
805 case "master_avatar_last":
806 MasterAvatarLastName = (string) configuration_result;
807 break;
808 case "master_avatar_pass":
809 MasterAvatarSandboxPassword = (string)configuration_result;
810 break;
811 case "lastmap_uuid": 715 case "lastmap_uuid":
812 lastMapUUID = (UUID)configuration_result; 716 lastMapUUID = (UUID)configuration_result;
813 break; 717 break;
generated by cgit v1.1 at 2024-10-31 06:47:55 +0000