diff options
| author | Melanie | 2009-10-15 21:14:13 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-15 21:14:13 +0100 |
| commit | 6deef7d0f3e9657bdc7bc4c41011dba15fea944b (patch) | |
| tree | ffa84d5963afbb5390b132278c95df20b21681d5 /OpenSim/Services/AssetService/AssetService.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into h... (diff) | |
| download | opensim-SC-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.zip opensim-SC-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.gz opensim-SC-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.bz2 opensim-SC-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
| -rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index ebfd47a..df33db2 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
| @@ -64,12 +64,17 @@ namespace OpenSim.Services.AssetService | |||
| 64 | string loaderArgs = assetConfig.GetString("AssetLoaderArgs", | 64 | string loaderArgs = assetConfig.GetString("AssetLoaderArgs", |
| 65 | String.Empty); | 65 | String.Empty); |
| 66 | 66 | ||
| 67 | m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); | 67 | bool assetLoaderEnabled = assetConfig.GetBoolean("AssetLoaderEnabled", true); |
| 68 | m_AssetLoader.ForEachDefaultXmlAsset(loaderArgs, | 68 | |
| 69 | delegate(AssetBase a) | 69 | if (assetLoaderEnabled) |
| 70 | { | 70 | { |
| 71 | Store(a); | 71 | m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); |
| 72 | }); | 72 | m_AssetLoader.ForEachDefaultXmlAsset(loaderArgs, |
| 73 | delegate(AssetBase a) | ||
| 74 | { | ||
| 75 | Store(a); | ||
| 76 | }); | ||
| 77 | } | ||
| 73 | 78 | ||
| 74 | m_log.Info("[ASSET CONNECTOR]: Local asset service enabled"); | 79 | m_log.Info("[ASSET CONNECTOR]: Local asset service enabled"); |
| 75 | } | 80 | } |