aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/ConfigurationLoader.cs
diff options
context:
space:
mode:
authorBlueWall2011-02-09 14:45:40 -0500
committerBlueWall2011-02-09 14:45:40 -0500
commit0f736e5601a738b4da435b392774ba211647da9c (patch)
treeedb1f9d90c01841eea86b2ce0b2fbf410dc416ee /OpenSim/Region/Application/ConfigurationLoader.cs
parentMerge branch 'master' of /home/opensim/src/OpenSim/Core (diff)
parentFlash out the prim count module (diff)
downloadopensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.zip
opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.gz
opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.bz2
opensim-SC_OLD-0f736e5601a738b4da435b392774ba211647da9c.tar.xz
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs19
1 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 6e3d6af..40ab765 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -179,8 +179,10 @@ namespace OpenSim
179 for (int i = 0 ; i < sources.Count ; i++) 179 for (int i = 0 ; i < sources.Count ; i++)
180 { 180 {
181 if (ReadConfig(sources[i])) 181 if (ReadConfig(sources[i]))
182 {
182 iniFileExists = true; 183 iniFileExists = true;
183 AddIncludes(sources); 184 AddIncludes(sources);
185 }
184 } 186 }
185 187
186 if (!iniFileExists) 188 if (!iniFileExists)
@@ -235,10 +237,19 @@ namespace OpenSim
235 string path = Path.Combine(basepath, chunkWithoutWildcards); 237 string path = Path.Combine(basepath, chunkWithoutWildcards);
236 path = Path.GetFullPath(path) + chunkWithWildcards; 238 path = Path.GetFullPath(path) + chunkWithWildcards;
237 string[] paths = Util.Glob(path); 239 string[] paths = Util.Glob(path);
238 foreach (string p in paths) 240
241 // If the include path contains no wildcards, then warn the user that it wasn't found.
242 if (wildcardIndex == -1 && paths.Length == 0)
239 { 243 {
240 if (!sources.Contains(p)) 244 m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
241 sources.Add(p); 245 }
246 else
247 {
248 foreach (string p in paths)
249 {
250 if (!sources.Contains(p))
251 sources.Add(p);
252 }
242 } 253 }
243 } 254 }
244 } 255 }