diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 70f9fd0..ad5a960 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -125,21 +125,21 @@ namespace OpenSim | |||
125 | AddinManager.Initialize("."); | 125 | AddinManager.Initialize("."); |
126 | AddinManager.Registry.Update(null); | 126 | AddinManager.Registry.Update(null); |
127 | 127 | ||
128 | string iniFilePath = startupConfig.GetString("inifile", "OpenSim.ini"); | 128 | Application.iniFilePath = startupConfig.GetString("inifile", "OpenSim.ini"); |
129 | 129 | ||
130 | m_config = new IniConfigSource(); | 130 | m_config = new IniConfigSource(); |
131 | //check for .INI file (either default or name passed in command line) | 131 | //check for .INI file (either default or name passed in command line) |
132 | if (File.Exists(iniFilePath)) | 132 | if (File.Exists(Application.iniFilePath)) |
133 | { | 133 | { |
134 | m_config.Merge(new IniConfigSource(iniFilePath)); | 134 | m_config.Merge(new IniConfigSource(Application.iniFilePath)); |
135 | m_config.Merge(configSource); | 135 | m_config.Merge(configSource); |
136 | } | 136 | } |
137 | else | 137 | else |
138 | { | 138 | { |
139 | iniFilePath = Path.Combine(Util.configDir(), iniFilePath); | 139 | Application.iniFilePath = Path.Combine(Util.configDir(), Application.iniFilePath); |
140 | if (File.Exists(iniFilePath)) | 140 | if (File.Exists(Application.iniFilePath)) |
141 | { | 141 | { |
142 | m_config.Merge(new IniConfigSource(iniFilePath)); | 142 | m_config.Merge(new IniConfigSource(Application.iniFilePath)); |
143 | m_config.Merge(configSource); | 143 | m_config.Merge(configSource); |
144 | } | 144 | } |
145 | else | 145 | else |
@@ -149,7 +149,7 @@ namespace OpenSim | |||
149 | 149 | ||
150 | m_config.Merge(configSource); | 150 | m_config.Merge(configSource); |
151 | 151 | ||
152 | m_config.Save(iniFilePath); | 152 | m_config.Save(Application.iniFilePath); |
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||