diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs
index fcb544f27a..c7e1ef483c 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
protected string m_assetServerURL;
protected HGAssetMapper m_assetMapper;
- public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetCache, string assetServerURL) : base(assetCache)
+ public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetService, string assetServerURL) : base(assetService)
{
m_assetMapper = assMap;
m_assetServerURL = assetServerURL;
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
protected override AssetBase GetAsset(UUID uuid)
{
if (string.Empty == m_assetServerURL)
- return m_assetCache.Get(uuid.ToString());
+ return base.GetAsset(uuid);
else
return m_assetMapper.FetchAsset(m_assetServerURL, uuid);
}
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index af9909079e..dc4a0826e8 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -52,11 +52,8 @@ namespace OpenSim.Region.Framework.Scenes
public class UuidGatherer
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- ///
- /// Asset cache used for gathering assets
- ///
- protected IAssetService m_assetCache;
+
+ protected IAssetService m_assetService;
// ///
// /// Used as a temporary store of an asset which represents an object. This can be a null if no appropriate
@@ -71,7 +68,7 @@ namespace OpenSim.Region.Framework.Scenes
public UuidGatherer(IAssetService assetCache)
{
- m_assetCache = assetCache;
+ m_assetService = assetCache;
}
///
@@ -216,7 +213,7 @@ namespace OpenSim.Region.Framework.Scenes
///
protected virtual AssetBase GetAsset(UUID uuid)
{
- return m_assetCache.Get(uuid.ToString());
+ return m_assetService.Get(uuid.ToString());
// XXX: Switching to do this synchronously where the call was async before but we always waited for it
// to complete anyway!