aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs19
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 2f08bd6..bd5ee0b5 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -42,8 +42,8 @@ namespace OpenSim.Region.Environment.Modules
42 /// </summary> 42 /// </summary>
43 public class UserTextureDownloadService 43 public class UserTextureDownloadService
44 { 44 {
45 //private static readonly log4net.ILog m_log 45 private static readonly log4net.ILog m_log
46 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 /// <summary> 48 /// <summary>
49 /// Holds texture senders before they have received the appropriate texture from the asset cache. 49 /// Holds texture senders before they have received the appropriate texture from the asset cache.
@@ -81,16 +81,15 @@ namespace OpenSim.Region.Environment.Modules
81 { 81 {
82 if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender)) 82 if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender))
83 { 83 {
84 textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber); 84 // If we've received new non UUID information for this request and it hasn't dispatched
85 85 // yet, then update the request accordingly.
86 if ((textureSender.ImageLoaded) && 86 textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber);
87 (textureSender.Sending == false))
88 {
89 EnqueueTextureSender(textureSender);
90 }
91 } 87 }
92 else 88 else
93 { 89 {
90 //m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Adding download stat {0}", e.RequestedAssetID);
91 m_scene.AddPendingDownloads(1);
92
94 TextureSender requestHandler = 93 TextureSender requestHandler =
95 new TextureSender(client, e.DiscardLevel, e.PacketNumber); 94 new TextureSender(client, e.DiscardLevel, e.PacketNumber);
96 m_textureSenders.Add(e.RequestedAssetID, requestHandler); 95 m_textureSenders.Add(e.RequestedAssetID, requestHandler);
@@ -141,7 +140,7 @@ namespace OpenSim.Region.Environment.Modules
141 // TODO Send packet back to the client telling it not to expect the texture 140 // TODO Send packet back to the client telling it not to expect the texture
142 // The absence of this packet doesn't appear to be causing it a problem right now 141 // The absence of this packet doesn't appear to be causing it a problem right now
143 142
144 //m_log.InfoFormat("Removing {0} from pending downloads count", textureID); 143 //m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID);
145 m_scene.AddPendingDownloads(-1); 144 m_scene.AddPendingDownloads(-1);
146 } 145 }
147 146