* Cruft removal step #1. Cleaning Modules directory.

1 files changed, 28 insertions, 23 deletions

diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index 6f11f73..b181d20 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -39,55 +39,60 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
     {

         //private static readonly log4net.ILog m_log 

         //    = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);

-        

-        private LLUUID m_textureId;

+

+        private bool m_cancel = false;

         private IClientAPI m_client;

-        

+

         // See ITextureSender

-        public bool Sending 

-        { 

-            get { return false; }

-            set { m_sending = value; }

-        }

-                    

-        private bool m_sending = false;           

+

+        private bool m_sending = false;

+        private LLUUID m_textureId;

 

         // See ITextureSender

-        public bool Cancel 

-        { 

-            get { return false; }

-            set { m_cancel = value; }

-        }

-                    

-        private bool m_cancel = false;      

-        

+

         public TextureNotFoundSender(IClientAPI client, LLUUID textureID)

         {

             m_client = client;

             m_textureId = textureID;

         }

-        

+

+        #region ITextureSender Members

+

+        public bool Sending

+        {

+            get { return false; }

+            set { m_sending = value; }

+        }

+

+        public bool Cancel

+        {

+            get { return false; }

+            set { m_cancel = value; }

+        }

+

         // See ITextureSender

         public void UpdateRequest(int discardLevel, uint packetNumber)

         {

             // Not need to implement since priority changes don't affect this operation

         }

-        

+

         // See ITextureSender

         public bool SendTexturePacket()

         {

             //m_log.InfoFormat(

             //    "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", 

             //    m_textureId);

-            

+

             ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();

             notFound.ImageID.ID = m_textureId;

-            

+

             // XXX Temporarily disabling as this appears to be causing client crashes on at least

             // 1.19.0(5) of the Linden Second Life client.

             // m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);

-            

+

             return true;

         }

+

+        #endregion

     }

 }
\ No newline at end of file