From 08b06ec67060df7ef714ee1ab228e1ef1966afe3 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 10 Nov 2020 01:24:13 +0000 Subject: [PATCH] lludp textures.. do not try to decode meshes and other things ( imprudence plague at LBSA) --- OpenSim/Region/Application/OpenSim.cs | 2 +- OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index cb7e05780e..0e8c26132b 100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -537,7 +537,7 @@ namespace OpenSim } } - // kick client... + // kick client... if (alert != null) presence.ControllingClient.Kick(alert); else diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs index 0a6785cee1..90390ec019 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs @@ -194,7 +194,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // Check for missing image asset data if (m_asset == null) { - m_log.Warn("[J2KIMAGE]: RunUpdate() called with missing asset data (no missing image texture?). Canceling texture transfer"); + //m_log.Warn("[J2KIMAGE]: RunUpdate() called with missing asset data (no missing image texture?). Canceling texture transfer"); m_currentPacket = m_stopPacket; return; } @@ -415,6 +415,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (asset != null) { assetID = asset.FullID; + if(asset.Type != (byte)AssetType.Texture) + asset = null; } else if ((InventoryAccessModule != null) && (sender != InventoryAccessModule)) {