diff options
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Framework/RegionInfo.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 98ef5d5..5a3b814 100644..100755 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -528,7 +528,7 @@ namespace OpenSim.Framework | |||
528 | { | 528 | { |
529 | while (name.Trim() == string.Empty) | 529 | while (name.Trim() == string.Empty) |
530 | { | 530 | { |
531 | name = MainConsole.Instance.CmdPrompt("New region name", name); | 531 | name = MainConsole.Instance.Prompt("New region name", name); |
532 | if (name.Trim() == string.Empty) | 532 | if (name.Trim() == string.Empty) |
533 | { | 533 | { |
534 | MainConsole.Instance.Output("Cannot interactively create region with no name"); | 534 | MainConsole.Instance.Output("Cannot interactively create region with no name"); |
@@ -570,7 +570,7 @@ namespace OpenSim.Framework | |||
570 | UUID newID = UUID.Random(); | 570 | UUID newID = UUID.Random(); |
571 | while (RegionID == UUID.Zero) | 571 | while (RegionID == UUID.Zero) |
572 | { | 572 | { |
573 | regionUUID = MainConsole.Instance.CmdPrompt("RegionUUID", newID.ToString()); | 573 | regionUUID = MainConsole.Instance.Prompt("RegionUUID", newID.ToString()); |
574 | if (!UUID.TryParse(regionUUID.Trim(), out RegionID)) | 574 | if (!UUID.TryParse(regionUUID.Trim(), out RegionID)) |
575 | { | 575 | { |
576 | MainConsole.Instance.Output("RegionUUID must be a valid UUID"); | 576 | MainConsole.Instance.Output("RegionUUID must be a valid UUID"); |
@@ -587,7 +587,7 @@ namespace OpenSim.Framework | |||
587 | string location = config.GetString("Location", String.Empty); | 587 | string location = config.GetString("Location", String.Empty); |
588 | if (location == String.Empty) | 588 | if (location == String.Empty) |
589 | { | 589 | { |
590 | location = MainConsole.Instance.CmdPrompt("Region Location", "1000,1000"); | 590 | location = MainConsole.Instance.Prompt("Region Location", "1000,1000"); |
591 | config.Set("Location", location); | 591 | config.Set("Location", location); |
592 | } | 592 | } |
593 | 593 | ||
@@ -623,7 +623,7 @@ namespace OpenSim.Framework | |||
623 | } | 623 | } |
624 | else | 624 | else |
625 | { | 625 | { |
626 | address = IPAddress.Parse(MainConsole.Instance.CmdPrompt("Internal IP address", "0.0.0.0")); | 626 | address = IPAddress.Parse(MainConsole.Instance.Prompt("Internal IP address", "0.0.0.0")); |
627 | config.Set("InternalAddress", address.ToString()); | 627 | config.Set("InternalAddress", address.ToString()); |
628 | } | 628 | } |
629 | 629 | ||
@@ -637,7 +637,7 @@ namespace OpenSim.Framework | |||
637 | } | 637 | } |
638 | else | 638 | else |
639 | { | 639 | { |
640 | port = Convert.ToInt32(MainConsole.Instance.CmdPrompt("Internal port", "9000")); | 640 | port = Convert.ToInt32(MainConsole.Instance.Prompt("Internal port", "9000")); |
641 | config.Set("InternalPort", port); | 641 | config.Set("InternalPort", port); |
642 | } | 642 | } |
643 | m_internalEndPoint = new IPEndPoint(address, port); | 643 | m_internalEndPoint = new IPEndPoint(address, port); |
@@ -652,7 +652,7 @@ namespace OpenSim.Framework | |||
652 | else | 652 | else |
653 | { | 653 | { |
654 | if (creatingNew) | 654 | if (creatingNew) |
655 | m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Resolve hostname to IP on start (for running inside Docker)", "False")); | 655 | m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.Prompt("Resolve hostname to IP on start (for running inside Docker)", "False")); |
656 | 656 | ||
657 | config.Set("ResolveAddress", m_resolveAddress.ToString()); | 657 | config.Set("ResolveAddress", m_resolveAddress.ToString()); |
658 | } | 658 | } |
@@ -667,7 +667,7 @@ namespace OpenSim.Framework | |||
667 | } | 667 | } |
668 | else | 668 | else |
669 | { | 669 | { |
670 | externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP"); | 670 | externalName = MainConsole.Instance.Prompt("External host name", "SYSTEMIP"); |
671 | config.Set("ExternalHostName", externalName); | 671 | config.Set("ExternalHostName", externalName); |
672 | } | 672 | } |
673 | if (externalName == "SYSTEMIP") | 673 | if (externalName == "SYSTEMIP") |