diff options
| author | UbitUmarov | 2016-12-30 01:52:02 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-30 01:52:02 +0000 |
| commit | 2a01173715e8adc9ea2f263221aed1302ed7675f (patch) | |
| tree | 116300a1eebe09421da112635be883196f2b41f0 /OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Serving robots.txt from bin Idea of solution for http://opensimulator.org/man... (diff) | |
| download | opensim-SC-2a01173715e8adc9ea2f263221aed1302ed7675f.zip opensim-SC-2a01173715e8adc9ea2f263221aed1302ed7675f.tar.gz opensim-SC-2a01173715e8adc9ea2f263221aed1302ed7675f.tar.bz2 opensim-SC-2a01173715e8adc9ea2f263221aed1302ed7675f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 47dcbcd..6d1f0c2 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 | } |