aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-09-13 23:17:42 +0100
committerMelanie2010-09-13 23:27:47 +0100
commit2cf98e77fc331f6032f6eb600139771085629bbf (patch)
tree2ba00ff3b0f22afd87bcbb964058f81cd4f80151
parentMake the inimaster option default to OpenSimDefaults.ini. (diff)
downloadopensim-SC_OLD-2cf98e77fc331f6032f6eb600139771085629bbf.zip
opensim-SC_OLD-2cf98e77fc331f6032f6eb600139771085629bbf.tar.gz
opensim-SC_OLD-2cf98e77fc331f6032f6eb600139771085629bbf.tar.bz2
opensim-SC_OLD-2cf98e77fc331f6032f6eb600139771085629bbf.tar.xz
Output an error and quit if the master file is missing. Also rename
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs20
-rw-r--r--bin/OpenSimDefaults.ini.example (renamed from bin/OpenSim.ini.example)0
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
85 string masterFileName = 85 string masterFileName =
86 startupConfig.GetString("inimaster", "OpenSimDefaults.ini"); 86 startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
87 87
88 if (masterFileName == "none")
89 masterFileName = String.Empty;
90
88 if (IsUri(masterFileName)) 91 if (IsUri(masterFileName))
89 { 92 {
90 if (!sources.Contains(masterFileName)) 93 if (!sources.Contains(masterFileName))
@@ -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
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