Patch from jhurliman. Fixing the texture decoding issues in progressive

texture sending. Grain of salt not included.
This commit is contained in:
Melanie Thielker
2008-11-18 20:02:25 +00:00
parent 18b6250f40
commit 0abb762ecc
9 changed files with 11 additions and 11 deletions

View File

@@ -28,7 +28,6 @@
using System.Reflection;
using log4net;
using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;

View File

@@ -27,7 +27,6 @@
using System;
using System.Reflection;
using OpenMetaverse.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;
@@ -198,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
// See ITextureSender
public bool SendTexturePacket()
{
if (!m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket))
if (download != null && !m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket))
{
SendPacket();
return false;

View File

@@ -29,7 +29,6 @@ using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using OpenMetaverse;
using OpenMetaverse.Packets;
using log4net;
using Nini.Config;
using Nwc.XmlRpc;