aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs24
-rw-r--r--bin/OpenSimDefaults.ini.example (renamed from bin/OpenSim.ini.example)0
2 files changed, 18 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index e2e0640..6e3d6af 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -83,7 +83,10 @@ namespace OpenSim
83 List<string> sources = new List<string>(); 83 List<string> sources = new List<string>();
84 84
85 string masterFileName = 85 string masterFileName =
86 startupConfig.GetString("inimaster", String.Empty); 86 startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
87
88 if (masterFileName == "none")
89 masterFileName = String.Empty;
87 90
88 if (IsUri(masterFileName)) 91 if (IsUri(masterFileName))
89 { 92 {
@@ -95,10 +98,19 @@ namespace OpenSim
95 string masterFilePath = Path.GetFullPath( 98 string masterFilePath = Path.GetFullPath(
96 Path.Combine(Util.configDir(), masterFileName)); 99 Path.Combine(Util.configDir(), masterFileName));
97 100
98 if (masterFileName != String.Empty && 101 if (masterFileName != String.Empty)
99 File.Exists(masterFilePath) && 102 {
100 (!sources.Contains(masterFilePath))) 103 if (File.Exists(masterFilePath))
101 sources.Add(masterFilePath); 104 {
105 if (!sources.Contains(masterFilePath))
106 sources.Add(masterFilePath);
107 }
108 else
109 {
110 m_log.ErrorFormat("Master ini file {0} not found", masterFilePath);
111 Environment.Exit(1);
112 }
113 }
102 } 114 }
103 115
104 116
@@ -160,7 +172,7 @@ namespace OpenSim
160 if (sources.Count == 0) 172 if (sources.Count == 0)
161 { 173 {
162 m_log.FatalFormat("[CONFIG]: Could not load any configuration"); 174 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
163 m_log.FatalFormat("[CONFIG]: Did you copy the OpenSim.ini.example file to OpenSim.ini?"); 175 m_log.FatalFormat("[CONFIG]: Did you copy the OpenSimDefaults.ini.example file to OpenSimDefaults.ini?");
164 Environment.Exit(1); 176 Environment.Exit(1);
165 } 177 }
166 178
diff --git a/bin/OpenSim.ini.example b/bin/OpenSimDefaults.ini.example
index 8d714ce..8d714ce 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSimDefaults.ini.example