diff options
Diffstat (limited to 'OpenSim/Tools/Configger/ConfigurationLoader.cs')
-rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index 0b6ee9c..4820e0b 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs | |||
@@ -64,14 +64,14 @@ namespace OpenSim.Tools.Configger | |||
64 | /// <param name="configSettings"></param> | 64 | /// <param name="configSettings"></param> |
65 | /// <param name="networkInfo"></param> | 65 | /// <param name="networkInfo"></param> |
66 | /// <returns>A configuration that gets passed to modules</returns> | 66 | /// <returns>A configuration that gets passed to modules</returns> |
67 | public IConfigSource LoadConfigSettings() | 67 | public IConfigSource LoadConfigSettings(IConfig startupConfig) |
68 | { | 68 | { |
69 | bool iniFileExists = false; | 69 | bool iniFileExists = false; |
70 | 70 | ||
71 | List<string> sources = new List<string>(); | 71 | List<string> sources = new List<string>(); |
72 | 72 | ||
73 | string iniFileName = "OpenSim.ini"; | 73 | string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini")); |
74 | string iniFilePath = Path.Combine(".", iniFileName); | 74 | Console.WriteLine("---> " + iniFileName + " <---"); |
75 | 75 | ||
76 | if (IsUri(iniFileName)) | 76 | if (IsUri(iniFileName)) |
77 | { | 77 | { |
@@ -80,10 +80,10 @@ namespace OpenSim.Tools.Configger | |||
80 | } | 80 | } |
81 | else | 81 | else |
82 | { | 82 | { |
83 | if (File.Exists(iniFilePath)) | 83 | if (File.Exists(iniFileName)) |
84 | { | 84 | { |
85 | if (!sources.Contains(iniFilePath)) | 85 | if (!sources.Contains(iniFileName)) |
86 | sources.Add(iniFilePath); | 86 | sources.Add(iniFileName); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | 89 | ||