diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs | 29 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 6 |
2 files changed, 17 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs index 5be2a65..65138e2 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -45,8 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
45 | /// </summary> | 45 | /// </summary> |
46 | public class UserTextureDownloadService | 46 | public class UserTextureDownloadService |
47 | { | 47 | { |
48 | private static readonly ILog m_log | 48 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
50 | 49 | ||
51 | /// <summary> | 50 | /// <summary> |
52 | /// True if the service has been closed, probably because a user with texture requests still queued | 51 | /// True if the service has been closed, probably because a user with texture requests still queued |
@@ -88,13 +87,13 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
88 | /// XXX This is really a temporary solution to deal with the situation where a client continually requests | 87 | /// XXX This is really a temporary solution to deal with the situation where a client continually requests |
89 | /// the same missing textures | 88 | /// the same missing textures |
90 | /// </summary> | 89 | /// </summary> |
91 | private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy | 90 | // private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy |
92 | = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); | 91 | // = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); |
93 | 92 | ||
94 | public UserTextureDownloadService( | 93 | public UserTextureDownloadService( |
95 | IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue) | 94 | IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue) |
96 | { | 95 | { |
97 | m_client = client; | 96 | // m_client = client; |
98 | m_scene = scene; | 97 | m_scene = scene; |
99 | m_sharedSendersQueue = sharedQueue; | 98 | m_sharedSendersQueue = sharedQueue; |
100 | } | 99 | } |
@@ -231,16 +230,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
231 | /// Place a ready texture sender on the processing queue. | 230 | /// Place a ready texture sender on the processing queue. |
232 | /// </summary> | 231 | /// </summary> |
233 | /// <param name="textureSender"></param> | 232 | /// <param name="textureSender"></param> |
234 | private void EnqueueTextureSender(ITextureSender textureSender) | 233 | // private void EnqueueTextureSender(ITextureSender textureSender) |
235 | { | 234 | // { |
236 | textureSender.Cancel = false; | 235 | // textureSender.Cancel = false; |
237 | textureSender.Sending = true; | 236 | // textureSender.Sending = true; |
238 | 237 | // | |
239 | if (!m_sharedSendersQueue.Contains(textureSender)) | 238 | // if (!m_sharedSendersQueue.Contains(textureSender)) |
240 | { | 239 | // { |
241 | m_sharedSendersQueue.Enqueue(textureSender); | 240 | // m_sharedSendersQueue.Enqueue(textureSender); |
242 | } | 241 | // } |
243 | } | 242 | // } |
244 | 243 | ||
245 | /// <summary> | 244 | /// <summary> |
246 | /// Close this module. | 245 | /// Close this module. |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 7082e85..ad42523 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -60,9 +60,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
60 | 60 | ||
61 | public class UrlModule : ISharedRegionModule, IUrlModule | 61 | public class UrlModule : ISharedRegionModule, IUrlModule |
62 | { | 62 | { |
63 | private static readonly ILog m_log = | 63 | // private static readonly ILog m_log = |
64 | LogManager.GetLogger( | 64 | // LogManager.GetLogger( |
65 | MethodBase.GetCurrentMethod().DeclaringType); | 65 | // MethodBase.GetCurrentMethod().DeclaringType); |
66 | 66 | ||
67 | private Dictionary<UUID, UrlData> m_RequestMap = | 67 | private Dictionary<UUID, UrlData> m_RequestMap = |
68 | new Dictionary<UUID, UrlData>(); | 68 | new Dictionary<UUID, UrlData>(); |