diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 30 | ||||
-rw-r--r-- | OpenSim/Tools/Configger/Util.cs | 6 |
2 files changed, 36 insertions, 0 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index f1d3649..4190f10 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs | |||
@@ -70,6 +70,36 @@ namespace OpenSim.Tools.Configger | |||
70 | 70 | ||
71 | List<string> sources = new List<string>(); | 71 | List<string> sources = new List<string>(); |
72 | 72 | ||
73 | string masterFileName = startupConfig.GetString("inimaster", "OpenSimDefaults.ini"); | ||
74 | |||
75 | if (masterFileName == "none") | ||
76 | masterFileName = String.Empty; | ||
77 | |||
78 | if (IsUri(masterFileName)) | ||
79 | { | ||
80 | if (!sources.Contains(masterFileName)) | ||
81 | sources.Add(masterFileName); | ||
82 | } | ||
83 | else | ||
84 | { | ||
85 | string masterFilePath = Path.GetFullPath( | ||
86 | Path.Combine(Util.configDir(), masterFileName)); | ||
87 | |||
88 | if (masterFileName != String.Empty) | ||
89 | { | ||
90 | if (File.Exists(masterFilePath)) | ||
91 | { | ||
92 | if (!sources.Contains(masterFilePath)) | ||
93 | sources.Add(masterFilePath); | ||
94 | } | ||
95 | else | ||
96 | { | ||
97 | m_log.ErrorFormat("Master ini file {0} not found", Path.GetFullPath(masterFilePath)); | ||
98 | Environment.Exit(1); | ||
99 | } | ||
100 | } | ||
101 | } | ||
102 | |||
73 | string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini")); | 103 | string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini")); |
74 | 104 | ||
75 | if (IsUri(iniFileName)) | 105 | if (IsUri(iniFileName)) |
diff --git a/OpenSim/Tools/Configger/Util.cs b/OpenSim/Tools/Configger/Util.cs index fe7744d..1a24034 100644 --- a/OpenSim/Tools/Configger/Util.cs +++ b/OpenSim/Tools/Configger/Util.cs | |||
@@ -102,5 +102,11 @@ namespace OpenSim.Tools.Configger | |||
102 | 102 | ||
103 | return found.ToArray(); | 103 | return found.ToArray(); |
104 | } | 104 | } |
105 | |||
106 | public static string configDir() | ||
107 | { | ||
108 | return "."; | ||
109 | } | ||
110 | |||
105 | } | 111 | } |
106 | } | 112 | } |