diff options
| author | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
| commit | 3f703ae1cb02cbcb0efaff061d495bacca941de0 (patch) | |
| tree | 3221068b4bc4119023b3dfa621c19e126c2eb3f3 /OpenSim/Tools/Configger/Main.cs | |
| parent | Merge branch 'master' into 0.8-post-fixes (diff) | |
| parent | minor: Comment out 2 error level debugging message in authentication code (diff) | |
| download | opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.zip opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.gz opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.bz2 opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.xz | |
Merge branch 'master' into 0.8-post-fixes
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tools/Configger/Main.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Tools/Configger/Main.cs b/OpenSim/Tools/Configger/Main.cs index 61a12e3..d7d918b 100644 --- a/OpenSim/Tools/Configger/Main.cs +++ b/OpenSim/Tools/Configger/Main.cs | |||
| @@ -35,15 +35,16 @@ namespace OpenSim.Tools.Configger | |||
| 35 | public static int Main(string[] args) | 35 | public static int Main(string[] args) |
| 36 | { | 36 | { |
| 37 | ArgvConfigSource argvConfig = new ArgvConfigSource(args); | 37 | ArgvConfigSource argvConfig = new ArgvConfigSource(args); |
| 38 | |||
| 38 | argvConfig.AddSwitch("Startup", "format", "f"); | 39 | argvConfig.AddSwitch("Startup", "format", "f"); |
| 40 | argvConfig.AddSwitch("Startup", "inifile"); | ||
| 39 | 41 | ||
| 40 | IConfig startupConfig = argvConfig.Configs["Startup"]; | 42 | IConfig startupConfig = argvConfig.Configs["Startup"]; |
| 41 | 43 | ||
| 42 | string format = startupConfig.GetString("format", "ini"); | 44 | string format = startupConfig.GetString("format", "ini"); |
| 43 | 45 | ||
| 44 | ConfigurationLoader loader = new ConfigurationLoader(); | 46 | ConfigurationLoader loader = new ConfigurationLoader(); |
| 45 | 47 | IConfigSource s = loader.LoadConfigSettings(startupConfig); | |
| 46 | IConfigSource s = loader.LoadConfigSettings(); | ||
| 47 | 48 | ||
| 48 | if (format == "mysql") | 49 | if (format == "mysql") |
| 49 | { | 50 | { |