aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs12
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs9
2 files changed, 2 insertions, 19 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index 4d0568d..42d09eb 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -247,7 +247,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
247 247
248 if (m_asset == null) 248 if (m_asset == null)
249 { 249 {
250 m_log.Warn("[J2KIMAGE]: Sending ImageNotInDatabase for texture " + TextureID);
251 client.SendImageNotFound(TextureID); 250 client.SendImageNotFound(TextureID);
252 return true; 251 return true;
253 } 252 }
@@ -385,15 +384,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
385 384
386 if (asset == null || asset.Data == null) 385 if (asset == null || asset.Data == null)
387 { 386 {
388 if (m_imageManager.MissingImage != null) 387 m_asset = null;
389 { 388 IsDecoded = true;
390 m_asset = m_imageManager.MissingImage.Data;
391 }
392 else
393 {
394 m_asset = null;
395 IsDecoded = true;
396 }
397 } 389 }
398 else 390 else
399 { 391 {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
index 41dd4d1..bdb33dd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
@@ -54,7 +54,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
54 54
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;
58 private IAssetService m_assetCache; 57 private IAssetService m_assetCache;
59 private IJ2KDecoder m_j2kDecodeModule; 58 private IJ2KDecoder m_j2kDecodeModule;
60 59
@@ -73,19 +72,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
73 /// </summary> 72 /// </summary>
74 public IClientAPI Client { get; private set; } 73 public IClientAPI Client { get; private set; }
75 74
76 public AssetBase MissingImage { get { return m_missingImage; } }
77
78 public LLImageManager(IClientAPI client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule) 75 public LLImageManager(IClientAPI client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
79 { 76 {
80 Client = client; 77 Client = client;
81 m_assetCache = pAssetCache; 78 m_assetCache = pAssetCache;
82 79
83 if (pAssetCache != null)
84 m_missingImage = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f");
85
86 if (m_missingImage == null)
87 m_log.Error("[ClientView] - Couldn't set missing image asset, falling back to missing image packet. This is known to crash the client");
88
89 m_j2kDecodeModule = pJ2kDecodeModule; 80 m_j2kDecodeModule = pJ2kDecodeModule;
90 } 81 }
91 82