diff options
| author | Justin Clark-Casey (justincc) | 2010-09-14 01:38:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-14 01:38:53 +0100 |
| commit | c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1 (patch) | |
| tree | f33f9f8ce58f363d6495ea2e17448946f81fb6f8 /OpenSim/Region/Application/ConfigurationLoader.cs | |
| parent | Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does t... (diff) | |
| download | opensim-SC_OLD-c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1.zip opensim-SC_OLD-c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1.tar.gz opensim-SC_OLD-c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1.tar.bz2 opensim-SC_OLD-c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1.tar.xz | |
Move OpenSimDefaults,ini into config-include in order to put it with all the other default files
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 6e3d6af..f4a97d5 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -83,7 +83,7 @@ namespace OpenSim | |||
| 83 | List<string> sources = new List<string>(); | 83 | List<string> sources = new List<string>(); |
| 84 | 84 | ||
| 85 | string masterFileName = | 85 | string masterFileName = |
| 86 | startupConfig.GetString("inimaster", "OpenSimDefaults.ini"); | 86 | startupConfig.GetString("inimaster", "config-include/OpenSimDefaults.ini"); |
| 87 | 87 | ||
| 88 | if (masterFileName == "none") | 88 | if (masterFileName == "none") |
| 89 | masterFileName = String.Empty; | 89 | masterFileName = String.Empty; |