From 5b3897a4af247a14dfd36fa00bb6999e0a1078d5 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 25 Feb 2008 15:36:24 +0000
Subject: * Caught HttpListenerException and swallowed if with output * Moved
Flush into Close since it's always done in that order. * Minor renamings *
Reversed if for clarity
---
.../Modules/UserTextureDownloadService.cs | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs')
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 1ac6ad2..c325746 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Modules
/// texture sender for processing.
///
///
- ///
+ ///
public void TextureCallback(LLUUID textureID, AssetBase texture)
{
lock (m_textureSenders)
@@ -124,25 +124,25 @@ namespace OpenSim.Region.Environment.Modules
if (m_textureSenders.TryGetValue(textureID, out textureSender))
{
- if (null != texture)
- {
- if (!textureSender.ImageLoaded)
- {
- textureSender.TextureReceived(texture);
- EnqueueTextureSender(textureSender);
- }
- }
- else
+ if (texture == null)
{
// Right now, leaving it up to lower level asset server code to post the fact that
// this texture could not be found
-
+
// TODO Send packet back to the client telling it not to expect the texture
-
+
//m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID);
m_scene.AddPendingDownloads(-1);
}
-
+ else
+ {
+ if (!textureSender.ImageLoaded)
+ {
+ textureSender.TextureReceived(texture);
+ EnqueueTextureSender(textureSender);
+ }
+ }
+
//m_log.InfoFormat("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID);
m_textureSenders.Remove(textureID);
//m_log.InfoFormat("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count);
--
cgit v1.1