diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/Application/Application.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Region/Application/Application.cs')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 555baa4..7721cdf 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -129,7 +129,6 @@ namespace OpenSim | |||
| 129 | configSource.AddSwitch("Startup", "inifile"); | 129 | configSource.AddSwitch("Startup", "inifile"); |
| 130 | configSource.AddSwitch("Startup", "inimaster"); | 130 | configSource.AddSwitch("Startup", "inimaster"); |
| 131 | configSource.AddSwitch("Startup", "inidirectory"); | 131 | configSource.AddSwitch("Startup", "inidirectory"); |
| 132 | configSource.AddSwitch("Startup", "gridmode"); | ||
| 133 | configSource.AddSwitch("Startup", "physics"); | 132 | configSource.AddSwitch("Startup", "physics"); |
| 134 | configSource.AddSwitch("Startup", "gui"); | 133 | configSource.AddSwitch("Startup", "gui"); |
| 135 | configSource.AddSwitch("Startup", "console"); | 134 | configSource.AddSwitch("Startup", "console"); |