diff options
Diffstat (limited to '')
3 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs index fc31283..7529111 100644 --- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs | |||
@@ -43,6 +43,9 @@ namespace OpenSim.Region.Environment.Modules | |||
43 | //and some small clean up | 43 | //and some small clean up |
44 | public class TextureDownloadModule : IRegionModule | 44 | public class TextureDownloadModule : IRegionModule |
45 | { | 45 | { |
46 | private static readonly log4net.ILog m_log | ||
47 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
46 | private Scene m_scene; | 49 | private Scene m_scene; |
47 | private List<Scene> m_scenes = new List<Scene>(); | 50 | private List<Scene> m_scenes = new List<Scene>(); |
48 | 51 | ||
@@ -164,6 +167,8 @@ namespace OpenSim.Region.Environment.Modules | |||
164 | m_queueSenders.Enqueue(sender); | 167 | m_queueSenders.Enqueue(sender); |
165 | } | 168 | } |
166 | } | 169 | } |
170 | |||
171 | m_log.Info(String.Format("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count())); | ||
167 | } | 172 | } |
168 | } | 173 | } |
169 | 174 | ||
@@ -174,4 +179,4 @@ namespace OpenSim.Region.Environment.Modules | |||
174 | } | 179 | } |
175 | 180 | ||
176 | } | 181 | } |
177 | } \ No newline at end of file | 182 | } |
diff --git a/OpenSim/Region/Environment/Modules/TextureSender.cs b/OpenSim/Region/Environment/Modules/TextureSender.cs index 053a558..08da591 100644 --- a/OpenSim/Region/Environment/Modules/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/TextureSender.cs | |||
@@ -36,7 +36,8 @@ namespace OpenSim.Region.Environment.Modules | |||
36 | { | 36 | { |
37 | public class TextureSender | 37 | public class TextureSender |
38 | { | 38 | { |
39 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly log4net.ILog m_log |
40 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
40 | 41 | ||
41 | public int counter = 0; | 42 | public int counter = 0; |
42 | private AssetBase m_asset; | 43 | private AssetBase m_asset; |
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs index b458d67..08b6979 100644 --- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs | |||
@@ -37,6 +37,9 @@ namespace OpenSim.Region.Environment.Modules | |||
37 | { | 37 | { |
38 | public class UserTextureDownloadService | 38 | public class UserTextureDownloadService |
39 | { | 39 | { |
40 | private static readonly log4net.ILog m_log | ||
41 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | |||
40 | private readonly Dictionary<LLUUID, TextureSender> m_textureSenders = new Dictionary<LLUUID, TextureSender>(); | 43 | private readonly Dictionary<LLUUID, TextureSender> m_textureSenders = new Dictionary<LLUUID, TextureSender>(); |
41 | private readonly BlockingQueue<TextureSender> m_sharedSendersQueue; | 44 | private readonly BlockingQueue<TextureSender> m_sharedSendersQueue; |
42 | private readonly Scene m_scene; | 45 | private readonly Scene m_scene; |
@@ -98,9 +101,12 @@ namespace OpenSim.Region.Environment.Modules | |||
98 | if (!textureSender.ImageLoaded) | 101 | if (!textureSender.ImageLoaded) |
99 | { | 102 | { |
100 | textureSender.TextureReceived(asset); | 103 | textureSender.TextureReceived(asset); |
101 | |||
102 | EnqueueTextureSender(textureSender); | 104 | EnqueueTextureSender(textureSender); |
103 | } | 105 | } |
106 | |||
107 | m_log.Info(String.Format("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID)); | ||
108 | m_textureSenders.Remove(textureID); | ||
109 | m_log.Info(String.Format("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count)); | ||
104 | } | 110 | } |
105 | else | 111 | else |
106 | { | 112 | { |