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 553786b..0a78df2 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -108,6 +108,13 @@ namespace OpenSim | |||
108 | get { return m_clientServers; } | 108 | get { return m_clientServers; } |
109 | } | 109 | } |
110 | 110 | ||
111 | protected EnvConfigSource m_EnvConfigSource = new EnvConfigSource(); | ||
112 | |||
113 | public EnvConfigSource envConfigSource | ||
114 | { | ||
115 | get { return m_EnvConfigSource; } | ||
116 | } | ||
117 | |||
111 | protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); | 118 | protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); |
112 | 119 | ||
113 | public uint HttpServerPort | 120 | public uint HttpServerPort |
@@ -142,7 +149,7 @@ namespace OpenSim | |||
142 | protected virtual void LoadConfigSettings(IConfigSource configSource) | 149 | protected virtual void LoadConfigSettings(IConfigSource configSource) |
143 | { | 150 | { |
144 | m_configLoader = new ConfigurationLoader(); | 151 | m_configLoader = new ConfigurationLoader(); |
145 | m_config = m_configLoader.LoadConfigSettings(configSource, out m_configSettings, out m_networkServersInfo); | 152 | m_config = m_configLoader.LoadConfigSettings(configSource, envConfigSource, out m_configSettings, out m_networkServersInfo); |
146 | ReadExtraConfigSettings(); | 153 | ReadExtraConfigSettings(); |
147 | } | 154 | } |
148 | 155 | ||