From 8f4bf435344af76d7ff6436ec74eab92399c3a99 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 1 Apr 2011 00:55:05 +0100
Subject: [PATCH] When asked to join region to existing estate, make first
 estate name the default instead of None

---
 OpenSim/Region/Application/OpenSimBase.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f98d70283a..ea9edf686b 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -876,15 +876,12 @@ namespace OpenSim
                                 = MainConsole.Instance.CmdPrompt(
                                     string.Format(
                                         "Name of estate to join.  Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())), 
-                                    "None");
-                            
-                            if (response == "None")
-                                continue;
+                                    estateNames[0]);
     
                             List<int> estateIDs = EstateDataService.GetEstates(response);
                             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;
                             }