aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2019-05-19 22:58:47 +1000
committeronefang2019-05-19 22:58:47 +1000
commit5d6c3b7f1fdf62b699ae004973e2ebd999c0afbb (patch)
tree885e21aba21df5939f8ab9e1644914c5fd53a2b2
parentSome extra examples and performance .ini files. (diff)
downloadopensim-SC_OLD-5d6c3b7f1fdf62b699ae004973e2ebd999c0afbb.zip
opensim-SC_OLD-5d6c3b7f1fdf62b699ae004973e2ebd999c0afbb.tar.gz
opensim-SC_OLD-5d6c3b7f1fdf62b699ae004973e2ebd999c0afbb.tar.bz2
opensim-SC_OLD-5d6c3b7f1fdf62b699ae004973e2ebd999c0afbb.tar.xz
Don't read .ini region files, use .xml instead.
Coz OpenSim can get confused, and I have a better idea.
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs17
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
68 } 68 }
69 69
70 string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); 70 string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
71 string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini"); 71//// Causes problems with the actual .ini files if they are in the same place.
72//// Coz it tries to load each .ini section as a sim, and hangs.
73//// string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
72 74
73 // Create an empty Regions.ini if there are no existing config files. 75 // Create an empty Regions.xml if there are no existing config files.
74 if (!allowRegionless && configFiles.Length == 0 && iniFiles.Length == 0) 76 if (!allowRegionless && configFiles.Length == 0 /*&& iniFiles.Length == 0*/)
75 { 77 {
76 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource); 78 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.xml"), false, m_configSource);
77 iniFiles = Directory.GetFiles(regionConfigPath, "*.ini"); 79 configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
78 } 80 }
79 81
80 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath); 82 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath);
@@ -82,6 +84,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
82 List<RegionInfo> regionInfos = new List<RegionInfo>(); 84 List<RegionInfo> regionInfos = new List<RegionInfo>();
83 85
84 int i = 0; 86 int i = 0;
87/*
85 foreach (string file in iniFiles) 88 foreach (string file in iniFiles)
86 { 89 {
87 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file); 90 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
@@ -98,7 +101,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
98 i++; 101 i++;
99 } 102 }
100 } 103 }
101 104*/
102 foreach (string file in configFiles) 105 foreach (string file in configFiles)
103 { 106 {
104 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file); 107 m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
@@ -114,4 +117,4 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
114 return regionInfos.ToArray(); 117 return regionInfos.ToArray();
115 } 118 }
116 } 119 }
117} \ No newline at end of file 120}