diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 0e14441..c064064 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | |||
@@ -25,6 +25,8 @@ | |||
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 System.Reflection; | ||
29 | using log4net; | ||
28 | using OpenMetaverse; | 30 | using OpenMetaverse; |
29 | using OpenMetaverse.Packets; | 31 | using OpenMetaverse.Packets; |
30 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -37,22 +39,15 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
37 | /// </summary> | 39 | /// </summary> |
38 | public class TextureNotFoundSender : ITextureSender | 40 | public class TextureNotFoundSender : ITextureSender |
39 | { | 41 | { |
40 | //private static readonly log4net.ILog m_log | 42 | // private static readonly log4net.ILog m_log |
41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 43 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
42 | 44 | ||
43 | // private bool m_cancel = false; | 45 | // private IClientAPI m_client; |
44 | // private IClientAPI m_client; | 46 | // private UUID m_textureId; |
45 | |||
46 | // See ITextureSender | ||
47 | |||
48 | // private bool m_sending = false; | ||
49 | //private UUID m_textureId; | ||
50 | |||
51 | // See ITextureSender | ||
52 | 47 | ||
53 | public TextureNotFoundSender(IClientAPI client, UUID textureID) | 48 | public TextureNotFoundSender(IClientAPI client, UUID textureID) |
54 | { | 49 | { |
55 | // // m_client = client; | 50 | //m_client = client; |
56 | //m_textureId = textureID; | 51 | //m_textureId = textureID; |
57 | } | 52 | } |
58 | 53 | ||
@@ -61,40 +56,31 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
61 | public bool Sending | 56 | public bool Sending |
62 | { | 57 | { |
63 | get { return false; } | 58 | get { return false; } |
64 | set | 59 | set {} |
65 | { | ||
66 | // m_sending = value; | ||
67 | } | ||
68 | } | 60 | } |
69 | 61 | ||
70 | public bool Cancel | 62 | public bool Cancel |
71 | { | 63 | { |
72 | get { return false; } | 64 | get { return false; } |
73 | set | 65 | set {} |
74 | { | ||
75 | // m_cancel = value; | ||
76 | } | ||
77 | } | 66 | } |
78 | 67 | ||
79 | // See ITextureSender | 68 | // See ITextureSender |
80 | public void UpdateRequest(int discardLevel, uint packetNumber) | 69 | public void UpdateRequest(int discardLevel, uint packetNumber) |
81 | { | 70 | { |
82 | // Not need to implement since priority changes don't affect this operation | 71 | // No need to implement since priority changes don't affect this operation |
83 | } | 72 | } |
84 | 73 | ||
85 | // See ITextureSender | 74 | // See ITextureSender |
86 | public bool SendTexturePacket() | 75 | public bool SendTexturePacket() |
87 | { | 76 | { |
88 | //m_log.InfoFormat( | 77 | // m_log.DebugFormat( |
89 | // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", | 78 | // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", |
90 | // m_textureId); | 79 | // m_textureId); |
91 | |||
92 | //ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); | ||
93 | //notFound.ImageID.ID = m_textureId; | ||
94 | 80 | ||
95 | // XXX Temporarily disabling as this appears to be causing client crashes on at least | 81 | // XXX Temporarily disabling as this appears to be causing client crashes on at least |
96 | // 1.19.0(5) of the Linden Second Life client. | 82 | // 1.19.0(5) of the Linden Second Life client. |
97 | // m_client.OutPacket(notFound, ThrottleOutPacketType.Texture); | 83 | // m_client.SendImageNotFound(m_textureId); |
98 | 84 | ||
99 | return true; | 85 | return true; |
100 | } | 86 | } |