aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-01-28 22:46:29 +0000
committerJustin Clark-Casey (justincc)2011-01-28 22:46:29 +0000
commit1fcb919798f8ff132353d447e6dfb81bedd3bc44 (patch)
treea42e1cbb1cafb0841610077f7a8ecb925cd60195 /OpenSim/Region
parentAdd groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.ini (diff)
downloadopensim-SC_OLD-1fcb919798f8ff132353d447e6dfb81bedd3bc44.zip
opensim-SC_OLD-1fcb919798f8ff132353d447e6dfb81bedd3bc44.tar.gz
opensim-SC_OLD-1fcb919798f8ff132353d447e6dfb81bedd3bc44.tar.bz2
opensim-SC_OLD-1fcb919798f8ff132353d447e6dfb81bedd3bc44.tar.xz
If a non-globbed included file from config cannot be found then warn the user
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs16
1 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 6e3d6af..d246181 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -180,6 +180,7 @@ namespace OpenSim
180 { 180 {
181 if (ReadConfig(sources[i])) 181 if (ReadConfig(sources[i]))
182 iniFileExists = true; 182 iniFileExists = true;
183
183 AddIncludes(sources); 184 AddIncludes(sources);
184 } 185 }
185 186
@@ -235,10 +236,19 @@ namespace OpenSim
235 string path = Path.Combine(basepath, chunkWithoutWildcards); 236 string path = Path.Combine(basepath, chunkWithoutWildcards);
236 path = Path.GetFullPath(path) + chunkWithWildcards; 237 path = Path.GetFullPath(path) + chunkWithWildcards;
237 string[] paths = Util.Glob(path); 238 string[] paths = Util.Glob(path);
238 foreach (string p in paths) 239
240 // If the include path contains no wildcards, then warn the user that it wasn't found.
241 if (wildcardIndex == -1 && paths.Length == 0)
239 { 242 {
240 if (!sources.Contains(p)) 243 m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
241 sources.Add(p); 244 }
245 else
246 {
247 foreach (string p in paths)
248 {
249 if (!sources.Contains(p))
250 sources.Add(p);
251 }
242 } 252 }
243 } 253 }
244 } 254 }