removed replacement texture in UDP Texture code. The replacement texture introduces false data into viewer cache. Removing that decreases the necessity for clearing the viewer cache. The viewer knows with ImageNotInDatabase that it is missing and can therefore know what to do about it a lot better than the sim does.

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>

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
 
             if (m_asset == null)
             {
-                m_log.Warn("[J2KIMAGE]: Sending ImageNotInDatabase for texture " + TextureID);
                 client.SendImageNotFound(TextureID);
                 return true;
             }
@@ -385,15 +384,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (asset == null || asset.Data == null)
             {
-                if (m_imageManager.MissingImage != null)
-                {
-                    m_asset = m_imageManager.MissingImage.Data;
-                }
-                else
-                {
-                    m_asset = null;
-                    IsDecoded = true;
-                }
+                m_asset = null;
+                IsDecoded = true;
             }
             else
             {
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
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private bool m_shuttingdown;
-        private AssetBase m_missingImage;
         private IAssetService m_assetCache;
         private IJ2KDecoder m_j2kDecodeModule;
 
@@ -73,19 +72,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public IClientAPI Client { get; private set; }
 
-        public AssetBase MissingImage { get { return m_missingImage; } }
-
         public LLImageManager(IClientAPI client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
         {
             Client = client;
             m_assetCache = pAssetCache;
 
-            if (pAssetCache != null)
-                m_missingImage = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f");
-            
-            if (m_missingImage == null)
-                m_log.Error("[ClientView] - Couldn't set missing image asset, falling back to missing image packet. This is known to crash the client");
-
             m_j2kDecodeModule = pJ2kDecodeModule;
         }