aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-19 19:00:11 +0000
committerJustin Clark-Casey (justincc)2012-01-19 19:00:11 +0000
commit9356963bd36e5c3b8c2b27bfcc2efa60ffbd02d6 (patch)
tree10fbe60949d8ad43ca5d076dd685a1edd11e5d6a /OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
parentRegionReady: (diff)
downloadopensim-SC_OLD-9356963bd36e5c3b8c2b27bfcc2efa60ffbd02d6.zip
opensim-SC_OLD-9356963bd36e5c3b8c2b27bfcc2efa60ffbd02d6.tar.gz
opensim-SC_OLD-9356963bd36e5c3b8c2b27bfcc2efa60ffbd02d6.tar.bz2
opensim-SC_OLD-9356963bd36e5c3b8c2b27bfcc2efa60ffbd02d6.tar.xz
Add basic request and send image regression tests for LLImageManager
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
index db428f1..30d3712 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
@@ -55,16 +55,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
55 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 55 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
56 private bool m_shuttingdown; 56 private bool m_shuttingdown;
57 private AssetBase m_missingImage; 57 private AssetBase m_missingImage;
58 private LLClientView m_client; //Client we're assigned to 58 private IClientAPI m_client; //Client we're assigned to
59 private IAssetService m_assetCache; //Asset Cache 59 private IAssetService m_assetCache; //Asset Cache
60 private IJ2KDecoder m_j2kDecodeModule; //Our J2K module 60 private IJ2KDecoder m_j2kDecodeModule; //Our J2K module
61 private C5.IntervalHeap<J2KImage> m_priorityQueue = new C5.IntervalHeap<J2KImage>(10, new J2KImageComparer()); 61 private C5.IntervalHeap<J2KImage> m_priorityQueue = new C5.IntervalHeap<J2KImage>(10, new J2KImageComparer());
62 private object m_syncRoot = new object(); 62 private object m_syncRoot = new object();
63 63
64 public LLClientView Client { get { return m_client; } } 64 public IClientAPI Client { get { return m_client; } }
65 public AssetBase MissingImage { get { return m_missingImage; } } 65 public AssetBase MissingImage { get { return m_missingImage; } }
66 66
67 public LLImageManager(LLClientView client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule) 67 public LLImageManager(IClientAPI client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
68 { 68 {
69 m_client = client; 69 m_client = client;
70 m_assetCache = pAssetCache; 70 m_assetCache = pAssetCache;