1 files changed, 17 insertions, 4 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 5a3b814..b88d31f 100755
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -198,6 +198,11 @@ namespace OpenSim.Framework
         {
             // m_configSource = configSource;
             CacheID = UUID.Random();
+            if (string.Empty == filename)
+            {
+                ReadNiniConfig(configSource, "Region", configName);
+                return;
+            }
 
             if (filename.ToLower().EndsWith(".ini"))
             {
@@ -425,7 +430,7 @@ namespace OpenSim.Framework
             set { m_remotingPort = value; }
         }
 
-        
+
         /// <value>
         /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
         ///
@@ -514,6 +519,10 @@ namespace OpenSim.Framework
 
         private void ReadNiniConfig(IConfigSource source, string name)
         {
+            ReadNiniConfig(source, name, name);
+        }
+        private void ReadNiniConfig(IConfigSource source, string section, string name)
+        {
             bool creatingNew = false;
 
             if (source.Configs.Count == 0)
@@ -549,8 +558,7 @@ namespace OpenSim.Framework
                 source.AddConfig(name);
             }
 
-            RegionName = name;
-            IConfig config = source.Configs[name];
+            IConfig config = source.Configs[section];
 
             // Track all of the keys in this config and remove as they are processed
             // The remaining keys will be added to generic key-value storage for
@@ -561,6 +569,11 @@ namespace OpenSim.Framework
                 allKeys.Add(s);
             }
 
+            // RegionName
+            //
+            allKeys.Remove("RegionName");
+            RegionName = config.GetString("RegionName", name);
+
             // RegionUUID
             //
             allKeys.Remove("RegionUUID");
@@ -675,7 +688,7 @@ namespace OpenSim.Framework
                 m_externalHostName = Util.GetLocalHost().ToString();
                 m_log.InfoFormat(
                     "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}",
-                    m_externalHostName, name);
+                    m_externalHostName, RegionName);
             }
             else if (!m_resolveAddress)
             {