1 files changed, 93 insertions, 93 deletions
diff --git a/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index 7b835a1..6f11f73 100644
--- a/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -1,93 +1,93 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using libsecondlife;
+using libsecondlife;
-using libsecondlife.Packets;
+using libsecondlife.Packets;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Sends a 'texture not found' packet back to the client
+    /// Sends a 'texture not found' packet back to the client
-    /// </summary>
+    /// </summary>
-    public class TextureNotFoundSender : ITextureSender
+    public class TextureNotFoundSender : ITextureSender
-    {
+    {
-        //private static readonly log4net.ILog m_log 
+        //private static readonly log4net.ILog m_log 
-        //    = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        //    = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        
+        
-        private LLUUID m_textureId;
+        private LLUUID m_textureId;
-        private IClientAPI m_client;
+        private IClientAPI m_client;
-        
+        
-        // See ITextureSender
+        // See ITextureSender
-        public bool Sending 
+        public bool Sending 
-        { 
+        { 
-            get { return false; }
+            get { return false; }
-            set { m_sending = value; }
+            set { m_sending = value; }
-        }
+        }
-                    
+                    
-        private bool m_sending = false;           
+        private bool m_sending = false;           
-        // See ITextureSender
+        // See ITextureSender
-        public bool Cancel 
+        public bool Cancel 
-        { 
+        { 
-            get { return false; }
+            get { return false; }
-            set { m_cancel = value; }
+            set { m_cancel = value; }
-        }
+        }
-                    
+                    
-        private bool m_cancel = false;      
+        private bool m_cancel = false;      
-        
+        
-        public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
+        public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
-        {
+        {
-            m_client = client;
+            m_client = client;
-            m_textureId = textureID;
+            m_textureId = textureID;
-        }
+        }
-        
+        
-        // See ITextureSender
+        // See ITextureSender
-        public void UpdateRequest(int discardLevel, uint packetNumber)
+        public void UpdateRequest(int discardLevel, uint packetNumber)
-        {
+        {
-            // Not need to implement since priority changes don't affect this operation
+            // Not need to implement since priority changes don't affect this operation
-        }
+        }
-        
+        
-        // See ITextureSender
+        // See ITextureSender
-        public bool SendTexturePacket()
+        public bool SendTexturePacket()
-        {
+        {
-            //m_log.InfoFormat(
+            //m_log.InfoFormat(
-            //    "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", 
+            //    "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", 
-            //    m_textureId);
+            //    m_textureId);
-            
+            
-            ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
+            ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
-            notFound.ImageID.ID = m_textureId;
+            notFound.ImageID.ID = m_textureId;
-            
+            
-            // XXX Temporarily disabling as this appears to be causing client crashes on at least
+            // XXX Temporarily disabling as this appears to be causing client crashes on at least
-            // 1.19.0(5) of the Linden Second Life client.
+            // 1.19.0(5) of the Linden Second Life client.
-            // m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);
+            // m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);
-            
+            
-            return true;
+            return true;
-        }
+        }
-    }
+    }
-}
+}
+\ No newline at end of file

diff --git a/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 7b835a1..6f11f73 100644 --- a/OpenSim/Region/Environment/Modules/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -1,93 +1,93 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using libsecondlife;	28	using libsecondlife;
29	using libsecondlife.Packets;	29	using libsecondlife.Packets;
30	using OpenSim.Framework;	30	using OpenSim.Framework;
31	using OpenSim.Region.Environment.Interfaces;	31	using OpenSim.Region.Environment.Interfaces;
32		32
33	namespace OpenSim.Region.Environment.Modules	33	namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
34	{	34	{
35	/// <summary>	35	/// <summary>
36	/// Sends a 'texture not found' packet back to the client	36	/// Sends a 'texture not found' packet back to the client
37	/// </summary>	37	/// </summary>
38	public class TextureNotFoundSender : ITextureSender	38	public class TextureNotFoundSender : ITextureSender
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 LLUUID m_textureId;
44	private IClientAPI m_client;	44	private IClientAPI m_client;
45		45
46	// See ITextureSender	46	// See ITextureSender
47	public bool Sending	47	public bool Sending
48	{	48	{
49	get { return false; }	49	get { return false; }
50	set { m_sending = value; }	50	set { m_sending = value; }
51	}	51	}
52		52
53	private bool m_sending = false;	53	private bool m_sending = false;
54		54
55	// See ITextureSender	55	// See ITextureSender
56	public bool Cancel	56	public bool Cancel
57	{	57	{
58	get { return false; }	58	get { return false; }
59	set { m_cancel = value; }	59	set { m_cancel = value; }
60	}	60	}
61		61
62	private bool m_cancel = false;	62	private bool m_cancel = false;
63		63
64	public TextureNotFoundSender(IClientAPI client, LLUUID textureID)	64	public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
65	{	65	{
66	m_client = client;	66	m_client = client;
67	m_textureId = textureID;	67	m_textureId = textureID;
68	}	68	}
69		69
70	// See ITextureSender	70	// See ITextureSender
71	public void UpdateRequest(int discardLevel, uint packetNumber)	71	public void UpdateRequest(int discardLevel, uint packetNumber)
72	{	72	{
73	// Not need to implement since priority changes don't affect this operation	73	// Not need to implement since priority changes don't affect this operation
74	}	74	}
75		75
76	// See ITextureSender	76	// See ITextureSender
77	public bool SendTexturePacket()	77	public bool SendTexturePacket()
78	{	78	{
79	//m_log.InfoFormat(	79	//m_log.InfoFormat(
80	// "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found",	80	// "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found",
81	// m_textureId);	81	// m_textureId);
82		82
83	ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();	83	ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
84	notFound.ImageID.ID = m_textureId;	84	notFound.ImageID.ID = m_textureId;
85		85
86	// XXX Temporarily disabling as this appears to be causing client crashes on at least	86	// 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.	87	// 1.19.0(5) of the Linden Second Life client.
88	// m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);	88	// m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);
89		89
90	return true;	90	return true;
91	}	91	}
92	}	92	}
93	}	93	} \ No newline at end of file