Add [Region] .ini block.

For including actual region definition in the normal .ini stack.

Same as the usual Region.ini format, except we add a RegionName
parameter.

1 files changed, 15 insertions, 5 deletions

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
index 0187418..4160483 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
@@ -68,9 +68,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             }
 
             string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
-//// Causes problems with the actual .ini files if they are in the same place.
-//// Coz it tries to load each .ini section as a sim, and hangs.
-////            string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
+
+            string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
 
             // Create an empty Regions.xml if there are no existing config files.
             if (!allowRegionless && configFiles.Length == 0 /*&& iniFiles.Length == 0*/)
@@ -84,7 +83,18 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             List<RegionInfo> regionInfos = new List<RegionInfo>();
 
             int i = 0;
-/*
+
+            IConfig regionConfig = (IConfig)m_configSource.Configs["Region"];
+            string name = regionConfig.GetString("RegionName", string.Empty).Trim();
+            if (string.Empty != name)
+            {
+                RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), string.Empty, false, m_configSource, name);
+                regionInfos.Add(regionInfo);
+
+                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
+                i++;
+            }
+
             foreach (string file in iniFiles)
             {
                 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
@@ -101,7 +111,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                     i++;
                 }
             }
-*/
+
             foreach (string file in configFiles)
             {
                 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);