diff options
author | Justin Clark-Casey (justincc) | 2012-09-21 01:57:13 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-21 01:57:13 +0100 |
commit | 632a42e2b1e9a649be812ed57de1189778a370c9 (patch) | |
tree | b116df88151a3c76a5ff90a865bfd32ea5edebc5 /OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs | |
parent | Simplify UuidGatherer by performing asset fetch synchronously rather than usi... (diff) | |
download | opensim-SC_OLD-632a42e2b1e9a649be812ed57de1189778a370c9.zip opensim-SC_OLD-632a42e2b1e9a649be812ed57de1189778a370c9.tar.gz opensim-SC_OLD-632a42e2b1e9a649be812ed57de1189778a370c9.tar.bz2 opensim-SC_OLD-632a42e2b1e9a649be812ed57de1189778a370c9.tar.xz |
Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs index fcb544f..c7e1ef4 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
40 | protected string m_assetServerURL; | 40 | protected string m_assetServerURL; |
41 | protected HGAssetMapper m_assetMapper; | 41 | protected HGAssetMapper m_assetMapper; |
42 | 42 | ||
43 | public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetCache, string assetServerURL) : base(assetCache) | 43 | public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetService, string assetServerURL) : base(assetService) |
44 | { | 44 | { |
45 | m_assetMapper = assMap; | 45 | m_assetMapper = assMap; |
46 | m_assetServerURL = assetServerURL; | 46 | m_assetServerURL = assetServerURL; |
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
49 | protected override AssetBase GetAsset(UUID uuid) | 49 | protected override AssetBase GetAsset(UUID uuid) |
50 | { | 50 | { |
51 | if (string.Empty == m_assetServerURL) | 51 | if (string.Empty == m_assetServerURL) |
52 | return m_assetCache.Get(uuid.ToString()); | 52 | return base.GetAsset(uuid); |
53 | else | 53 | else |
54 | return m_assetMapper.FetchAsset(m_assetServerURL, uuid); | 54 | return m_assetMapper.FetchAsset(m_assetServerURL, uuid); |
55 | } | 55 | } |