aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2009-02-28 15:16:12 +0000
committerMW2009-02-28 15:16:12 +0000
commit7a2985b4410d55e61212904d2df745110ded1f0f (patch)
tree5c017bd9e7d352cc326a82c47cb5e1bd2811b1a5
parentApplied Patch from mantis #3245. Thanks tlaukkan/Tommil (diff)
downloadopensim-SC_OLD-7a2985b4410d55e61212904d2df745110ded1f0f.zip
opensim-SC_OLD-7a2985b4410d55e61212904d2df745110ded1f0f.tar.gz
opensim-SC_OLD-7a2985b4410d55e61212904d2df745110ded1f0f.tar.bz2
opensim-SC_OLD-7a2985b4410d55e61212904d2df745110ded1f0f.tar.xz
Changed it so only .ini file types are loaded from the (optional) config directory rather all files types in that folder.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 64797da..799d7df 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -93,8 +93,11 @@ namespace OpenSim
93 string[] fileEntries = Directory.GetFiles(iniDirName); 93 string[] fileEntries = Directory.GetFiles(iniDirName);
94 foreach (string filePath in fileEntries) 94 foreach (string filePath in fileEntries)
95 { 95 {
96 // m_log.InfoFormat("reading ini file < {0} > from config dir", filePath); 96 if (Path.GetExtension(filePath).ToLower() == ".ini")
97 ReadConfig(Path.GetFileName(filePath), filePath, m_config, false); 97 {
98 // m_log.InfoFormat("reading ini file < {0} > from config dir", filePath);
99 ReadConfig(Path.GetFileName(filePath), filePath, m_config, false);
100 }
98 } 101 }
99 } 102 }
100 103