Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml

1 files changed, 19 insertions, 7 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 1b2f681..4bde7be 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -482,9 +482,16 @@ namespace OpenSim.Framework
                 MainConsole.Instance.Output("=====================================\n");
 
                 if (name == String.Empty)
-                    name = MainConsole.Instance.CmdPrompt("New region name", name);
-                if (name == String.Empty)
-                    throw new Exception("Cannot interactively create region with no name");
+                {
+                    while (name.Trim() == string.Empty)
+                    {
+                        name = MainConsole.Instance.CmdPrompt("New region name", name);
+                        if (name.Trim() == string.Empty)
+                        {
+                            MainConsole.Instance.Output("Cannot interactively create region with no name");
+                        }
+                    }
+                }
 
                 source.AddConfig(name);
 
@@ -515,15 +522,20 @@ namespace OpenSim.Framework
             //
             allKeys.Remove("RegionUUID");
             string regionUUID = config.GetString("RegionUUID", string.Empty);
-            if (regionUUID == String.Empty)
+            if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
             {
                 UUID newID = UUID.Random();
-
-                regionUUID = MainConsole.Instance.CmdPrompt("RegionUUID", newID.ToString());
+                while (RegionID == UUID.Zero)
+                {
+                    regionUUID = MainConsole.Instance.CmdPrompt("RegionUUID", newID.ToString());
+                    if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
+                    {
+                        MainConsole.Instance.Output("RegionUUID must be a valid UUID");
+                    }
+                }
                 config.Set("RegionUUID", regionUUID);
             }
 
-            RegionID = new UUID(regionUUID);
             originRegionID = RegionID; // What IS this?! (Needed for RegionCombinerModule?)
 
             // Location