Don't read .ini region files, use .xml instead.

Coz OpenSim can get confused, and I have a better idea.

1 files changed, 10 insertions, 7 deletions

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
index 976714c..0187418 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
@@ -68,13 +68,15 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             }
 
             string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
-            string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
+//// 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");
 
-            // Create an empty Regions.ini if there are no existing config files.
-            if (!allowRegionless && configFiles.Length == 0 && iniFiles.Length == 0)
+            // Create an empty Regions.xml if there are no existing config files.
+            if (!allowRegionless && configFiles.Length == 0 /*&& iniFiles.Length == 0*/)
             {
-                new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource);
-                iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
+                new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.xml"), false, m_configSource);
+                configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
             }
 
             m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath);
@@ -82,6 +84,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             List<RegionInfo> regionInfos = new List<RegionInfo>();
 
             int i = 0;
+/*
             foreach (string file in iniFiles)
             {
                 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
@@ -98,7 +101,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                     i++;
                 }
             }
-
+*/
             foreach (string file in configFiles)
             {
                 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
@@ -114,4 +117,4 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             return regionInfos.ToArray();
         }
     }
-}
\ No newline at end of file
+}