aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
diff options
context:
space:
mode:
authorlbsa712008-02-25 15:36:24 +0000
committerlbsa712008-02-25 15:36:24 +0000
commit5b3897a4af247a14dfd36fa00bb6999e0a1078d5 (patch)
tree7e70f5fdc18f458c813808ab5ef5486a80ea9604 /OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
parentUpdated paths in classaudit script. (diff)
downloadopensim-SC_OLD-5b3897a4af247a14dfd36fa00bb6999e0a1078d5.zip
opensim-SC_OLD-5b3897a4af247a14dfd36fa00bb6999e0a1078d5.tar.gz
opensim-SC_OLD-5b3897a4af247a14dfd36fa00bb6999e0a1078d5.tar.bz2
opensim-SC_OLD-5b3897a4af247a14dfd36fa00bb6999e0a1078d5.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs26
1 files changed, 13 insertions, 13 deletions
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
115 /// texture sender for processing. 115 /// texture sender for processing.
116 /// </summary> 116 /// </summary>
117 /// <param name="textureID"></param> 117 /// <param name="textureID"></param>
118 /// <param name="asset"></param> 118 /// <param name="texture"></param>
119 public void TextureCallback(LLUUID textureID, AssetBase texture) 119 public void TextureCallback(LLUUID textureID, AssetBase texture)
120 { 120 {
121 lock (m_textureSenders) 121 lock (m_textureSenders)
@@ -124,25 +124,25 @@ namespace OpenSim.Region.Environment.Modules
124 124
125 if (m_textureSenders.TryGetValue(textureID, out textureSender)) 125 if (m_textureSenders.TryGetValue(textureID, out textureSender))
126 { 126 {
127 if (null != texture) 127 if (texture == null)
128 {
129 if (!textureSender.ImageLoaded)
130 {
131 textureSender.TextureReceived(texture);
132 EnqueueTextureSender(textureSender);
133 }
134 }
135 else
136 { 128 {
137 // Right now, leaving it up to lower level asset server code to post the fact that 129 // Right now, leaving it up to lower level asset server code to post the fact that
138 // this texture could not be found 130 // this texture could not be found
139 131
140 // TODO Send packet back to the client telling it not to expect the texture 132 // TODO Send packet back to the client telling it not to expect the texture
141 133
142 //m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID); 134 //m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID);
143 m_scene.AddPendingDownloads(-1); 135 m_scene.AddPendingDownloads(-1);
144 } 136 }
145 137 else
138 {
139 if (!textureSender.ImageLoaded)
140 {
141 textureSender.TextureReceived(texture);
142 EnqueueTextureSender(textureSender);
143 }
144 }
145
146 //m_log.InfoFormat("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID); 146 //m_log.InfoFormat("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID);
147 m_textureSenders.Remove(textureID); 147 m_textureSenders.Remove(textureID);
148 //m_log.InfoFormat("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count); 148 //m_log.InfoFormat("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count);