diff options
author | Justin Clark-Casey (justincc) | 2011-03-21 21:37:06 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-21 21:37:06 +0000 |
commit | d3a20a1e9257ecec417e219ebaf079370015f06d (patch) | |
tree | 98a737503fde948d8e827527c03ea443aff46c9e /OpenSim/Region/Application | |
parent | Upgrade SQLite: (diff) | |
download | opensim-SC_OLD-d3a20a1e9257ecec417e219ebaf079370015f06d.zip opensim-SC_OLD-d3a20a1e9257ecec417e219ebaf079370015f06d.tar.gz opensim-SC_OLD-d3a20a1e9257ecec417e219ebaf079370015f06d.tar.bz2 opensim-SC_OLD-d3a20a1e9257ecec417e219ebaf079370015f06d.tar.xz |
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index e950613..f804cb7 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -828,7 +828,18 @@ namespace OpenSim | |||
828 | } | 828 | } |
829 | else | 829 | else |
830 | { | 830 | { |
831 | response = MainConsole.Instance.CmdPrompt("Estate name to join", "None"); | 831 | List<EstateSettings> estates = estateDataService.LoadEstateSettingsAll(); |
832 | |||
833 | List<string> estateNames = new List<string>(); | ||
834 | foreach (EstateSettings estate in estates) | ||
835 | estateNames.Add(estate.EstateName); | ||
836 | |||
837 | response | ||
838 | = MainConsole.Instance.CmdPrompt( | ||
839 | string.Format( | ||
840 | "Name of estate to join. Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())), | ||
841 | "None"); | ||
842 | |||
832 | if (response == "None") | 843 | if (response == "None") |
833 | continue; | 844 | continue; |
834 | 845 | ||