diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/Application/ConfigurationLoader.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
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 ) |