1 files changed, 97 insertions, 97 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index b181d20..70e44d4 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -1,98 +1,98 @@
-/*
+/*
- * 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.Agent.TextureDownload
+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 bool m_cancel = false;
+        private bool m_cancel = false;
-        private IClientAPI m_client;
+        private IClientAPI m_client;
-        // See ITextureSender
+        // See ITextureSender
-        private bool m_sending = false;
+        private bool m_sending = false;
-        private LLUUID m_textureId;
+        private LLUUID m_textureId;
-        // See ITextureSender
+        // See ITextureSender
-        public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
+        public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
-        {
+        {
-            m_client = client;
+            m_client = client;
-            m_textureId = textureID;
+            m_textureId = textureID;
-        }
+        }
-        #region ITextureSender Members
+        #region ITextureSender Members
-        public bool Sending
+        public bool Sending
-        {
+        {
-            get { return false; }
+            get { return false; }
-            set { m_sending = value; }
+            set { m_sending = value; }
-        }
+        }
-        public bool Cancel
+        public bool Cancel
-        {
+        {
-            get { return false; }
+            get { return false; }
-            set { m_cancel = value; }
+            set { m_cancel = value; }
-        }
+        }
-        // 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;
-        }
+        }
-        #endregion
+        #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 b181d20..70e44d4 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -1,98 +1,98 @@
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.Agent.TextureDownload	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 bool m_cancel = false;	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		47
48	private bool m_sending = false;	48	private bool m_sending = false;
49	private LLUUID m_textureId;	49	private LLUUID m_textureId;
50		50
51	// See ITextureSender	51	// See ITextureSender
52		52
53	public TextureNotFoundSender(IClientAPI client, LLUUID textureID)	53	public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
54	{	54	{
55	m_client = client;	55	m_client = client;
56	m_textureId = textureID;	56	m_textureId = textureID;
57	}	57	}
58		58
59	#region ITextureSender Members	59	#region ITextureSender Members
60		60
61	public bool Sending	61	public bool Sending
62	{	62	{
63	get { return false; }	63	get { return false; }
64	set { m_sending = value; }	64	set { m_sending = value; }
65	}	65	}
66		66
67	public bool Cancel	67	public bool Cancel
68	{	68	{
69	get { return false; }	69	get { return false; }
70	set { m_cancel = value; }	70	set { m_cancel = value; }
71	}	71	}
72		72
73	// See ITextureSender	73	// See ITextureSender
74	public void UpdateRequest(int discardLevel, uint packetNumber)	74	public void UpdateRequest(int discardLevel, uint packetNumber)
75	{	75	{
76	// 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
77	}	77	}
78		78
79	// See ITextureSender	79	// See ITextureSender
80	public bool SendTexturePacket()	80	public bool SendTexturePacket()
81	{	81	{
82	//m_log.InfoFormat(	82	//m_log.InfoFormat(
83	// "[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",
84	// m_textureId);	84	// m_textureId);
85		85
86	ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();	86	ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
87	notFound.ImageID.ID = m_textureId;	87	notFound.ImageID.ID = m_textureId;
88		88
89	// 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
90	// 1.19.0(5) of the Linden Second Life client.	90	// 1.19.0(5) of the Linden Second Life client.
91	// m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);	91	// m_client.OutPacket(notFound, ThrottleOutPacketType.Texture);
92		92
93	return true;	93	return true;
94	}	94	}
95		95
96	#endregion	96	#endregion
97	}	97	}
98	} \ No newline at end of file	98	} \ No newline at end of file