diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f1ff08f..69e8021 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -146,10 +146,15 @@ namespace OpenSim | |||
146 | 146 | ||
147 | protected virtual void ReadExtraConfigSettings() | 147 | protected virtual void ReadExtraConfigSettings() |
148 | { | 148 | { |
149 | 149 | IConfig networkConfig = m_config.Source.Configs["Network"]; | |
150 | if (networkConfig != null) | ||
151 | { | ||
152 | proxyUrl = networkConfig.GetString("proxy_url", ""); | ||
153 | proxyOffset = Int32.Parse(networkConfig.GetString("proxy_offset", "0")); | ||
154 | } | ||
150 | } | 155 | } |
151 | 156 | ||
152 | protected void LoadPlugins() | 157 | protected virtual void LoadPlugins() |
153 | { | 158 | { |
154 | PluginLoader<IApplicationPlugin> loader = | 159 | PluginLoader<IApplicationPlugin> loader = |
155 | new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this)); | 160 | new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this)); |
@@ -181,9 +186,6 @@ namespace OpenSim | |||
181 | InitialiseGridServices(libraryRootFolder); | 186 | InitialiseGridServices(libraryRootFolder); |
182 | } | 187 | } |
183 | 188 | ||
184 | proxyUrl = ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); | ||
185 | proxyOffset = Int32.Parse(ConfigSource.Source.Configs["Network"].GetString("proxy_offset", "0")); | ||
186 | |||
187 | // Create a ModuleLoader instance | 189 | // Create a ModuleLoader instance |
188 | m_moduleLoader = new ModuleLoader(m_config.Source); | 190 | m_moduleLoader = new ModuleLoader(m_config.Source); |
189 | 191 | ||
@@ -260,7 +262,7 @@ namespace OpenSim | |||
260 | /// <summary> | 262 | /// <summary> |
261 | /// Initialises the assetcache | 263 | /// Initialises the assetcache |
262 | /// </summary> | 264 | /// </summary> |
263 | protected void InitialiseAssetCache() | 265 | protected virtual void InitialiseAssetCache() |
264 | { | 266 | { |
265 | IAssetServer assetServer; | 267 | IAssetServer assetServer; |
266 | if (m_configSettings.AssetStorage == "grid") | 268 | if (m_configSettings.AssetStorage == "grid") |