aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-01 00:55:05 +0100
committerJustin Clark-Casey (justincc)2011-04-01 00:55:05 +0100
commit8f4bf435344af76d7ff6436ec74eab92399c3a99 (patch)
treee2223c6724d766c3d8fe0e64e607bab4f5727e92
parentMake default answer for 'do you wish to join region to an existing estate' ye... (diff)
downloadopensim-SC_OLD-8f4bf435344af76d7ff6436ec74eab92399c3a99.zip
opensim-SC_OLD-8f4bf435344af76d7ff6436ec74eab92399c3a99.tar.gz
opensim-SC_OLD-8f4bf435344af76d7ff6436ec74eab92399c3a99.tar.bz2
opensim-SC_OLD-8f4bf435344af76d7ff6436ec74eab92399c3a99.tar.xz
When asked to join region to existing estate, make first estate name the default instead of None
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f98d702..ea9edf6 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -876,15 +876,12 @@ namespace OpenSim
876 = MainConsole.Instance.CmdPrompt( 876 = MainConsole.Instance.CmdPrompt(
877 string.Format( 877 string.Format(
878 "Name of estate to join. Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())), 878 "Name of estate to join. Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())),
879 "None"); 879 estateNames[0]);
880
881 if (response == "None")
882 continue;
883 880
884 List<int> estateIDs = EstateDataService.GetEstates(response); 881 List<int> estateIDs = EstateDataService.GetEstates(response);
885 if (estateIDs.Count < 1) 882 if (estateIDs.Count < 1)
886 { 883 {
887 MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again."); 884 MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again.");
888 continue; 885 continue;
889 } 886 }
890 887