2 files changed, 16 insertions, 4 deletions

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 31ce500..9d6fef7 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/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,10 +98,19 @@ namespace OpenSim
                 string masterFilePath = Path.GetFullPath(
                         Path.Combine(Util.configDir(), masterFileName));
 
-                if (masterFileName != String.Empty &&
-                        File.Exists(masterFilePath) &&
-                        (!sources.Contains(masterFilePath)))
-                    sources.Add(masterFilePath);
+                if (masterFileName != String.Empty)
+                {
+                    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);
+                    }
+                }
             }
 
 
diff --git a/bin/OpenSim.ini.example b/bin/OpenSimDefaults.ini.example
index ef8f73a..ef8f73a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSimDefaults.ini.example