diff options
| author | Justin Clark-Casey (justincc) | 2010-09-14 03:30:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-14 03:30:07 +0100 |
| commit | 5d48e3c0bbfffc99a0bba4b2da86b18ed6803aa4 (patch) | |
| tree | 3648bd110588ac7abbc31812f12ee614842f66ff | |
| parent | Revert "Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebod... (diff) | |
| download | opensim-SC_OLD-5d48e3c0bbfffc99a0bba4b2da86b18ed6803aa4.zip opensim-SC_OLD-5d48e3c0bbfffc99a0bba4b2da86b18ed6803aa4.tar.gz opensim-SC_OLD-5d48e3c0bbfffc99a0bba4b2da86b18ed6803aa4.tar.bz2 opensim-SC_OLD-5d48e3c0bbfffc99a0bba4b2da86b18ed6803aa4.tar.xz | |
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1.
Reverted by agreement.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 | ||||
| -rw-r--r-- | bin/OpenSimDefaults.ini (renamed from bin/config-include/OpenSimDefaults.ini) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index f4a97d5..6e3d6af 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", "config-include/OpenSimDefaults.ini"); | 86 | startupConfig.GetString("inimaster", "OpenSimDefaults.ini"); |
| 87 | 87 | ||
| 88 | if (masterFileName == "none") | 88 | if (masterFileName == "none") |
| 89 | masterFileName = String.Empty; | 89 | masterFileName = String.Empty; |
diff --git a/bin/config-include/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 8d714ce..8d714ce 100644 --- a/bin/config-include/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||