diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 47dcbcd..6e4a710 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
@@ -57,13 +57,13 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
57 | /// <summary>List of client methods to notify of results of decode</summary> | 57 | /// <summary>List of client methods to notify of results of decode</summary> |
58 | private readonly Dictionary<UUID, List<DecodedCallback>> m_notifyList = new Dictionary<UUID, List<DecodedCallback>>(); | 58 | private readonly Dictionary<UUID, List<DecodedCallback>> m_notifyList = new Dictionary<UUID, List<DecodedCallback>>(); |
59 | /// <summary>Cache that will store decoded JPEG2000 layer boundary data</summary> | 59 | /// <summary>Cache that will store decoded JPEG2000 layer boundary data</summary> |
60 | private IImprovedAssetCache m_cache; | 60 | private IAssetCache m_cache; |
61 | private IImprovedAssetCache Cache | 61 | private IAssetCache Cache |
62 | { | 62 | { |
63 | get | 63 | get |
64 | { | 64 | { |
65 | if (m_cache == null) | 65 | if (m_cache == null) |
66 | m_cache = m_scene.RequestModuleInterface<IImprovedAssetCache>(); | 66 | m_cache = m_scene.RequestModuleInterface<IAssetCache>(); |
67 | 67 | ||
68 | return m_cache; | 68 | return m_cache; |
69 | } | 69 | } |
@@ -285,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
285 | // Cache Decoded layers | 285 | // Cache Decoded layers |
286 | SaveFileCacheForAsset(assetID, layers); | 286 | SaveFileCacheForAsset(assetID, layers); |
287 | } | 287 | } |
288 | 288 | ||
289 | // Notify Interested Parties | 289 | // Notify Interested Parties |
290 | lock (m_notifyList) | 290 | lock (m_notifyList) |
291 | { | 291 | { |
@@ -369,7 +369,8 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
369 | else if (Cache != null) | 369 | else if (Cache != null) |
370 | { | 370 | { |
371 | string assetName = "j2kCache_" + AssetId.ToString(); | 371 | string assetName = "j2kCache_" + AssetId.ToString(); |
372 | AssetBase layerDecodeAsset = Cache.Get(assetName); | 372 | AssetBase layerDecodeAsset; |
373 | Cache.Get(assetName, out layerDecodeAsset); | ||
373 | 374 | ||
374 | if (layerDecodeAsset != null) | 375 | if (layerDecodeAsset != null) |
375 | { | 376 | { |