Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.

I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.

1 files changed, 48 insertions, 20 deletions

diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index de4898a..a2f5d9c 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -57,6 +57,8 @@ namespace OpenSim.Framework.RegionLoader.Web
             {
                 IConfig startupConfig = (IConfig) m_configSource.Configs["Startup"];
                 string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim();
+                bool allowRegionless = startupConfig.GetBoolean("allow_regionless", false);
+
                 if (url == String.Empty)
                 {
                     m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty.");
@@ -64,37 +66,63 @@ namespace OpenSim.Framework.RegionLoader.Web
                 }
                 else
                 {
+                    RegionInfo[] regionInfos = new RegionInfo[] {};
+                    int regionCount = 0;
                     HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
                     webRequest.Timeout = 30000; //30 Second Timeout
                     m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
-                    HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
-                    m_log.Debug("[WEBLOADER]: Downloading region information...");
-                    StreamReader reader = new StreamReader(webResponse.GetResponseStream());
-                    string xmlSource = String.Empty;
-                    string tempStr = reader.ReadLine();
-                    while (tempStr != null)
+
+                    try
                     {
-                        xmlSource = xmlSource + tempStr;
-                        tempStr = reader.ReadLine();
+                        HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
+                        m_log.Debug("[WEBLOADER]: Downloading region information...");
+                        StreamReader reader = new StreamReader(webResponse.GetResponseStream());
+                        string xmlSource = String.Empty;
+                        string tempStr = reader.ReadLine();
+                        while (tempStr != null)
+                        {
+                            xmlSource = xmlSource + tempStr;
+                            tempStr = reader.ReadLine();
+                        }
+                        m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
+                                    xmlSource.Length);
+                        XmlDocument xmlDoc = new XmlDocument();
+                        xmlDoc.LoadXml(xmlSource);
+                        if (xmlDoc.FirstChild.Name == "Regions")
+                        {
+                            regionCount = xmlDoc.FirstChild.ChildNodes.Count;
+    
+                            if (regionCount > 0)
+                            {
+                                regionInfos = new RegionInfo[regionCount];
+                                int i;
+                                for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
+                                {
+                                    m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
+                                    regionInfos[i] =
+                                        new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
+                                }
+                            }
+                        }
                     }
-                    m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
-                                xmlSource.Length);
-                    XmlDocument xmlDoc = new XmlDocument();
-                    xmlDoc.LoadXml(xmlSource);
-                    if (xmlDoc.FirstChild.Name == "Regions")
+                    catch (WebException ex)
                     {
-                        RegionInfo[] regionInfos = new RegionInfo[xmlDoc.FirstChild.ChildNodes.Count];
-                        int i;
-                        for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
+                        if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
                         {
-                            m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
-                            regionInfos[i] =
-                                new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
+                            if (!allowRegionless)
+                                throw ex;
                         }
+                        else
+                            throw ex;
+                    }
 
+                    if (regionCount > 0 | allowRegionless)
                         return regionInfos;
+                    else
+                    {
+                        m_log.Error("[WEBLOADER]: No region configs were available.");
+                        return null;
                     }
-                    return null;
                 }
             }
         }