Output an error and quit if the master file is missing. Also rename

OpenSim.ini.example to bin/OpenSimDefaults.ini.example

OpenSim/Region/Application/ConfigurationLoader.cs

@@ -85,6 +85,9 @@ namespace OpenSim
             string masterFileName =
                     startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
 
+            if (masterFileName == "none")
+                masterFileName = String.Empty;
+
             if (IsUri(masterFileName))
             {
                 if (!sources.Contains(masterFileName))
@@ -95,11 +98,20 @@ namespace OpenSim
                 string masterFilePath = Path.GetFullPath(
                         Path.Combine(Util.configDir(), masterFileName));
 
-                if (masterFileName != String.Empty &&
+                if (masterFileName != String.Empty)
-                        File.Exists(masterFilePath) &&
+                {
-                        (!sources.Contains(masterFilePath)))
+                    if (File.Exists(masterFilePath)
+                    {
+                        if (!sources.Contains(masterFilePath))
                             sources.Add(masterFilePath);
                     }
+                    else
+                    {
+                        m_log.ErrorFormat("Master ini file {0} not found", masterFilePath);
+                        Environment.Exit(1);
+                    }
+                }
+            }
 
 
             string iniFileName =