diff options
| author | Justin Clark-Casey (justincc) | 2011-01-28 22:50:49 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-01-28 22:50:49 +0000 |
| commit | a4acf485d7332ff6c22a2e0dffdbd1409e4b2dcb (patch) | |
| tree | 3b18663c13462ed83db453972ca124effd75ea50 | |
| parent | If a non-globbed included file from config cannot be found then warn the user (diff) | |
| download | opensim-SC_OLD-a4acf485d7332ff6c22a2e0dffdbd1409e4b2dcb.zip opensim-SC_OLD-a4acf485d7332ff6c22a2e0dffdbd1409e4b2dcb.tar.gz opensim-SC_OLD-a4acf485d7332ff6c22a2e0dffdbd1409e4b2dcb.tar.bz2 opensim-SC_OLD-a4acf485d7332ff6c22a2e0dffdbd1409e4b2dcb.tar.xz | |
minor: don't bother reparsing the sources for includes if ReadConfig() was unsuccessful
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index d246181..40ab765 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -179,9 +179,10 @@ namespace OpenSim | |||
| 179 | for (int i = 0 ; i < sources.Count ; i++) | 179 | for (int i = 0 ; i < sources.Count ; i++) |
| 180 | { | 180 | { |
| 181 | if (ReadConfig(sources[i])) | 181 | if (ReadConfig(sources[i])) |
| 182 | { | ||
| 182 | iniFileExists = true; | 183 | iniFileExists = true; |
| 183 | 184 | AddIncludes(sources); | |
| 184 | AddIncludes(sources); | 185 | } |
| 185 | } | 186 | } |
| 186 | 187 | ||
| 187 | if (!iniFileExists) | 188 | if (!iniFileExists) |