diff options
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 8d95c41..fc3999f 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -188,7 +188,6 @@ namespace OpenSim | |||
| 188 | // Make sure command line options take precedence | 188 | // Make sure command line options take precedence |
| 189 | m_config.Source.Merge(argvSource); | 189 | m_config.Source.Merge(argvSource); |
| 190 | 190 | ||
| 191 | |||
| 192 | IConfig enVars = m_config.Source.Configs["Environment"]; | 191 | IConfig enVars = m_config.Source.Configs["Environment"]; |
| 193 | 192 | ||
| 194 | if( enVars != null ) | 193 | if( enVars != null ) |