OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
inv-download
Freaky Tech 2015-03-03 21:46:47 +01:00 committed by BlueWall
parent 0f72773017
commit 4d749d8c69
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
View File

@ -247,7 +247,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_asset == null) if (m_asset == null)
{ {
m_log.Warn("[J2KIMAGE]: Sending ImageNotInDatabase for texture " + TextureID);
client.SendImageNotFound(TextureID); client.SendImageNotFound(TextureID);
return true; return true;
} }
@ -384,17 +383,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
HasAsset = true; HasAsset = true;
if (asset == null || asset.Data == null) if (asset == null || asset.Data == null)
{
if (m_imageManager.MissingImage != null)
{
m_asset = m_imageManager.MissingImage.Data;
}
else
{ {
m_asset = null; m_asset = null;
IsDecoded = true; IsDecoded = true;
} }
}
else else
{ {
m_asset = asset.Data; m_asset = asset.Data;

9
OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
View File

@ -54,7 +54,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private bool m_shuttingdown; private bool m_shuttingdown;
private AssetBase m_missingImage;
private IAssetService m_assetCache; private IAssetService m_assetCache;
private IJ2KDecoder m_j2kDecodeModule; private IJ2KDecoder m_j2kDecodeModule;
@ -73,19 +72,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary> /// </summary>
public IClientAPI Client { get; private set; } public IClientAPI Client { get; private set; }
public AssetBase MissingImage { get { return m_missingImage; } }
public LLImageManager(IClientAPI client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule) public LLImageManager(IClientAPI client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
{ {
Client = client; Client = client;
m_assetCache = pAssetCache; 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; m_j2kDecodeModule = pJ2kDecodeModule;
} }