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 
-        { 
+        private bool m_sending = false;
-            get { return false; }
+        private LLUUID m_textureId;
-            set { m_sending = value; }
-        }
-                    
-        private bool m_sending = false;           
        // 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

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
39	{	39	{
40	//private static readonly log4net.ILog m_log	40	//private static readonly log4net.ILog m_log
41	// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);	41	// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
42		42
43	private LLUUID m_textureId;	43	private bool m_cancel = false;
44	private IClientAPI m_client;	44	private IClientAPI m_client;
45		45
46	// See ITextureSender	46	// See ITextureSender
47	public bool Sending	47
48	{	48	private bool m_sending = false;
49	get { return false; }	49	private LLUUID m_textureId;
50	set { m_sending = value; }
51	}
52
53	private bool m_sending = false;
54		50
55	// See ITextureSender	51	// See ITextureSender
56	public bool Cancel	52
57	{
58	get { return false; }
59	set { m_cancel = value; }
60	}
61
62	private bool m_cancel = false;
63
64	public TextureNotFoundSender(IClientAPI client, LLUUID textureID)	53	public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
65	{	54	{
66	m_client = client;	55	m_client = client;
67	m_textureId = textureID;	56	m_textureId = textureID;
68	}	57	}
69		58
		59	#region ITextureSender Members
		60
		61	public bool Sending
		62	{
		63	get { return false; }
		64	set { m_sending = value; }
		65	}
		66
		67	public bool Cancel
		68	{
		69	get { return false; }
		70	set { m_cancel = value; }
		71	}
		72
70	// See ITextureSender	73	// See ITextureSender
71	public void UpdateRequest(int discardLevel, uint packetNumber)	74	public void UpdateRequest(int discardLevel, uint packetNumber)
72	{	75	{
73	// Not need to implement since priority changes don't affect this operation	76	// Not need to implement since priority changes don't affect this operation
74	}	77	}
75		78
76	// See ITextureSender	79	// See ITextureSender
77	public bool SendTexturePacket()	80	public bool SendTexturePacket()
78	{	81	{
79	//m_log.InfoFormat(	82	//m_log.InfoFormat(
80	// "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found",	83	// "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found",
81	// m_textureId);	84	// m_textureId);
82		85
83	ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();	86	ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
84	notFound.ImageID.ID = m_textureId;	87	notFound.ImageID.ID = m_textureId;
85		88
86	// XXX Temporarily disabling as this appears to be causing client crashes on at least	89	// XXX Temporarily disabling as this appears to be causing client crashes on at least
87	// 1.19.0(5) of the Linden Second Life client.	90	// 1.19.0(5) of the Linden Second Life client.
88	// m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);	91	// m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);
89		92
90	return true;	93	return true;
91	}	94	}
		95
		96	#endregion
92	}	97	}
93	} \ No newline at end of file	98	} \ No newline at end of file