diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /OpenSim/Region/Application/Application.cs | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application/Application.cs')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 7e320e6..3b261e7 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -231,6 +231,8 @@ namespace OpenSim | |||
| 231 | configSource.Alias.AddAlias("Off", false); | 231 | configSource.Alias.AddAlias("Off", false); |
| 232 | configSource.Alias.AddAlias("True", true); | 232 | configSource.Alias.AddAlias("True", true); |
| 233 | configSource.Alias.AddAlias("False", false); | 233 | configSource.Alias.AddAlias("False", false); |
| 234 | configSource.Alias.AddAlias("Yes", true); | ||
| 235 | configSource.Alias.AddAlias("No", false); | ||
| 234 | 236 | ||
| 235 | configSource.AddSwitch("Startup", "background"); | 237 | configSource.AddSwitch("Startup", "background"); |
| 236 | configSource.AddSwitch("Startup", "inifile"); | 238 | configSource.AddSwitch("Startup", "inifile"); |
| @@ -239,6 +241,8 @@ namespace OpenSim | |||
| 239 | configSource.AddSwitch("Startup", "physics"); | 241 | configSource.AddSwitch("Startup", "physics"); |
| 240 | configSource.AddSwitch("Startup", "gui"); | 242 | configSource.AddSwitch("Startup", "gui"); |
| 241 | configSource.AddSwitch("Startup", "console"); | 243 | configSource.AddSwitch("Startup", "console"); |
| 244 | configSource.AddSwitch("Startup", "save_crashes"); | ||
| 245 | configSource.AddSwitch("Startup", "crash_dir"); | ||
| 242 | 246 | ||
| 243 | configSource.AddConfig("StandAlone"); | 247 | configSource.AddConfig("StandAlone"); |
| 244 | configSource.AddConfig("Network"); | 248 | configSource.AddConfig("Network"); |