aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs16
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index b958b01..5f549b5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
235 235
236 if (m_imageManager.Client.PacketHandler.GetQueueCount(ThrottleOutPacketType.Texture) == 0) 236 if (m_imageManager.Client.PacketHandler.GetQueueCount(ThrottleOutPacketType.Texture) == 0)
237 { 237 {
238 m_log.Debug("No textures queued, sending one packet to kickstart it"); 238 //m_log.Debug("No textures queued, sending one packet to kickstart it");
239 SendPacket(m_imageManager.Client); 239 SendPacket(m_imageManager.Client);
240 } 240 }
241 } 241 }
@@ -333,7 +333,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
333 if (Data == null) 333 if (Data == null)
334 { 334 {
335 client.SendImageNotFound(m_requestedUUID); 335 client.SendImageNotFound(m_requestedUUID);
336 m_log.WarnFormat("[TEXTURE]: Got null Data element on a asset {0}.. and the missing image Data property is al", m_requestedUUID); 336 m_log.WarnFormat("[TEXTURE]: Got null Data element on a asset {0}.. and the missing image Data property is also null", m_requestedUUID);
337 return true; 337 return true;
338 } 338 }
339 // Do we have less then 1 packet's worth of data? 339 // Do we have less then 1 packet's worth of data?
@@ -374,8 +374,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
374 374
375 if (asset == null || asset.Data == null) 375 if (asset == null || asset.Data == null)
376 { 376 {
377 m_asset = null; 377 if (m_imageManager.MissingImage != null)
378 m_decoded = true; 378 {
379 m_asset = m_imageManager.MissingImage;
380 m_assetDataLength = m_asset.Data.Length;
381 }
382 else
383 {
384 m_asset = null;
385 m_decoded = true;
386 }
379 } 387 }
380 else 388 else
381 { 389 {