OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When asked to join region to existing estate, make first estate name the default instead of None

0.7.1-dev
Justin Clark-Casey (justincc) 2011-04-01 00:55:05 +01:00
parent e1ceb461c0
commit 8f4bf43534
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -876,15 +876,12 @@ namespace OpenSim
= MainConsole.Instance.CmdPrompt( = MainConsole.Instance.CmdPrompt(
string.Format( string.Format(
"Name of estate to join. Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())), "Name of estate to join. Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())),
"None"); estateNames[0]);
if (response == "None")
continue;
List<int> estateIDs = EstateDataService.GetEstates(response); List<int> estateIDs = EstateDataService.GetEstates(response);
if (estateIDs.Count < 1) if (estateIDs.Count < 1)
{ {
MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again."); MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again.");
continue; continue;
} }