diff options
-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 | |||