diff options
| author | Diva Canto | 2012-09-21 07:45:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-21 07:45:26 -0700 |
| commit | f4cc19968cdbb72fd43cc950f6c8ef160f896438 (patch) | |
| tree | 80859de8ea03de99d8951235bc59e017c7012bd4 /OpenSim/Region/CoreModules/Framework | |
| parent | HG 2.0: added asset import/export policies at the sim too. (diff) | |
| parent | minor: Make slow outgoing request log messages consistent with other log mess... (diff) | |
| download | opensim-SC_OLD-f4cc19968cdbb72fd43cc950f6c8ef160f896438.zip opensim-SC_OLD-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.gz opensim-SC_OLD-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.bz2 opensim-SC_OLD-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -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 | } |