diff options
| author | Melanie | 2012-03-27 18:11:05 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-27 18:11:05 +0100 |
| commit | 6b5f3b49e783be3012f84d25bd986927c5a3e3e7 (patch) | |
| tree | 35187e0f7c0bb0ca7b712e02b56c91ae5ecfd3ee /OpenSim/Services/HypergridService/HGAssetService.cs | |
| parent | Replace HG linker with core version (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.zip opensim-SC_OLD-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.gz opensim-SC_OLD-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.bz2 opensim-SC_OLD-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGAssetService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs index 22e233a..db98166 100644 --- a/OpenSim/Services/HypergridService/HGAssetService.cs +++ b/OpenSim/Services/HypergridService/HGAssetService.cs | |||
| @@ -58,10 +58,10 @@ namespace OpenSim.Services.HypergridService | |||
| 58 | 58 | ||
| 59 | private UserAccountCache m_Cache; | 59 | private UserAccountCache m_Cache; |
| 60 | 60 | ||
| 61 | public HGAssetService(IConfigSource config) : base(config) | 61 | public HGAssetService(IConfigSource config, string configName) : base(config, configName) |
| 62 | { | 62 | { |
| 63 | m_log.Debug("[HGAsset Service]: Starting"); | 63 | m_log.Debug("[HGAsset Service]: Starting"); |
| 64 | IConfig assetConfig = config.Configs["HGAssetService"]; | 64 | IConfig assetConfig = config.Configs[configName]; |
| 65 | if (assetConfig == null) | 65 | if (assetConfig == null) |
| 66 | throw new Exception("No HGAssetService configuration"); | 66 | throw new Exception("No HGAssetService configuration"); |
| 67 | 67 | ||