diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 542211a..8e1eb95 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -112,6 +112,13 @@ namespace OpenSim | |||
112 | get { return m_clientServers; } | 112 | get { return m_clientServers; } |
113 | } | 113 | } |
114 | 114 | ||
115 | protected EnvConfigSource m_EnvConfigSource = new EnvConfigSource(); | ||
116 | |||
117 | public EnvConfigSource envConfigSource | ||
118 | { | ||
119 | get { return m_EnvConfigSource; } | ||
120 | } | ||
121 | |||
115 | protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); | 122 | protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); |
116 | 123 | ||
117 | public uint HttpServerPort | 124 | public uint HttpServerPort |
@@ -146,7 +153,7 @@ namespace OpenSim | |||
146 | protected virtual void LoadConfigSettings(IConfigSource configSource) | 153 | protected virtual void LoadConfigSettings(IConfigSource configSource) |
147 | { | 154 | { |
148 | m_configLoader = new ConfigurationLoader(); | 155 | m_configLoader = new ConfigurationLoader(); |
149 | m_config = m_configLoader.LoadConfigSettings(configSource, out m_configSettings, out m_networkServersInfo); | 156 | m_config = m_configLoader.LoadConfigSettings(configSource, envConfigSource, out m_configSettings, out m_networkServersInfo); |
150 | ReadExtraConfigSettings(); | 157 | ReadExtraConfigSettings(); |
151 | } | 158 | } |
152 | 159 | ||