Merge branch 'master' into careminster-presence-refactor

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
             for (int i = 0 ; i < sources.Count ; i++)
             {
                 if (ReadConfig(sources[i]))
+                {
                     iniFileExists = true;
-                AddIncludes(sources);
+                    AddIncludes(sources);
+                }
             }
 
             if (!iniFileExists)
@@ -235,10 +237,19 @@ namespace OpenSim
                             string path = Path.Combine(basepath, chunkWithoutWildcards);
                             path = Path.GetFullPath(path) + chunkWithWildcards;
                             string[] paths = Util.Glob(path);
-                            foreach (string p in paths)
+                            
+                            // If the include path contains no wildcards, then warn the user that it wasn't found.
+                            if (wildcardIndex == -1 && paths.Length == 0)
                             {
-                                if (!sources.Contains(p))
-                                    sources.Add(p);
+                                m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
+                            }
+                            else
+                            {                            
+                                foreach (string p in paths)
+                                {
+                                    if (!sources.Contains(p))
+                                        sources.Add(p);
+                                }
                             }
                         }
                     }