diff options
author | Dahlia Trimble | 2009-01-10 09:15:23 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-01-10 09:15:23 +0000 |
commit | 630ce5b26446883043aa5e6541a4550d0e918659 (patch) | |
tree | 5128485b0d8e94c96593b352a421623cbd053acb /OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | |
parent | Include the changes from StrawBerryFride's patch to (diff) | |
download | opensim-SC_OLD-630ce5b26446883043aa5e6541a4550d0e918659.zip opensim-SC_OLD-630ce5b26446883043aa5e6541a4550d0e918659.tar.gz opensim-SC_OLD-630ce5b26446883043aa5e6541a4550d0e918659.tar.bz2 opensim-SC_OLD-630ce5b26446883043aa5e6541a4550d0e918659.tar.xz |
Revert progressive texture patch from r8001 until issues can be addressed
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 044ee76..34ddee6 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using log4net; | 29 | using log4net; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using OpenMetaverse.Packets; | ||
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
32 | using OpenSim.Region.Environment.Interfaces; | 33 | using OpenSim.Region.Environment.Interfaces; |
33 | 34 | ||
@@ -38,11 +39,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
38 | /// </summary> | 39 | /// </summary> |
39 | public class TextureNotFoundSender : ITextureSender | 40 | public class TextureNotFoundSender : ITextureSender |
40 | { | 41 | { |
41 | // private static readonly log4net.ILog m_log | 42 | // private static readonly log4net.ILog m_log |
42 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 43 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
43 | 44 | ||
44 | // private IClientAPI m_client; | 45 | // private IClientAPI m_client; |
45 | // private UUID m_textureId; | 46 | // private UUID m_textureId; |
46 | 47 | ||
47 | public TextureNotFoundSender(IClientAPI client, UUID textureID) | 48 | public TextureNotFoundSender(IClientAPI client, UUID textureID) |
48 | { | 49 | { |
@@ -55,13 +56,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
55 | public bool Sending | 56 | public bool Sending |
56 | { | 57 | { |
57 | get { return false; } | 58 | get { return false; } |
58 | set {} | 59 | set { } |
59 | } | 60 | } |
60 | 61 | ||
61 | public bool Cancel | 62 | public bool Cancel |
62 | { | 63 | { |
63 | get { return false; } | 64 | get { return false; } |
64 | set {} | 65 | set { } |
65 | } | 66 | } |
66 | 67 | ||
67 | // See ITextureSender | 68 | // See ITextureSender |
@@ -73,13 +74,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
73 | // See ITextureSender | 74 | // See ITextureSender |
74 | public bool SendTexturePacket() | 75 | public bool SendTexturePacket() |
75 | { | 76 | { |
76 | // m_log.DebugFormat( | 77 | // m_log.DebugFormat( |
77 | // "[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", |
78 | // m_textureId); | 79 | // m_textureId); |
79 | 80 | ||
80 | // 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 |
81 | // 1.19.0(5) of the Linden Second Life client. | 82 | // 1.19.0(5) of the Linden Second Life client. |
82 | // m_client.SendImageNotFound(m_textureId); | 83 | // m_client.SendImageNotFound(m_textureId); |
83 | 84 | ||
84 | return true; | 85 | return true; |
85 | } | 86 | } |