diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs index 65138e2..19f0f90 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -60,22 +60,22 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
60 | /// currently handle properly as far as I know). However, this situation should be handled in a more | 60 | /// currently handle properly as far as I know). However, this situation should be handled in a more |
61 | /// sophisticated way. | 61 | /// sophisticated way. |
62 | /// </summary> | 62 | /// </summary> |
63 | private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5; | 63 | // private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5; |
64 | 64 | ||
65 | /// <summary> | 65 | /// <summary> |
66 | /// XXX Also going to limit requests for found textures. | 66 | /// XXX Also going to limit requests for found textures. |
67 | /// </summary> | 67 | /// </summary> |
68 | private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy | 68 | // private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy |
69 | = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); | 69 | // = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); |
70 | 70 | ||
71 | private readonly IClientAPI m_client; | 71 | // private readonly IClientAPI m_client; |
72 | private readonly Scene m_scene; | 72 | private readonly Scene m_scene; |
73 | 73 | ||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Texture Senders are placed in this queue once they have received their texture from the asset | 75 | /// Texture Senders are placed in this queue once they have received their texture from the asset |
76 | /// cache. Another module actually invokes the send. | 76 | /// cache. Another module actually invokes the send. |
77 | /// </summary> | 77 | /// </summary> |
78 | private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue; | 78 | // private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue; |
79 | 79 | ||
80 | /// <summary> | 80 | /// <summary> |
81 | /// Holds texture senders before they have received the appropriate texture from the asset cache. | 81 | /// Holds texture senders before they have received the appropriate texture from the asset cache. |
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
95 | { | 95 | { |
96 | // m_client = client; | 96 | // m_client = client; |
97 | m_scene = scene; | 97 | m_scene = scene; |
98 | m_sharedSendersQueue = sharedQueue; | 98 | // m_sharedSendersQueue = sharedQueue; |
99 | } | 99 | } |
100 | 100 | ||
101 | /// <summary> | 101 | /// <summary> |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7f691ba..bc36fda 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -9032,7 +9032,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9032 | Match m = r.Match(url); | 9032 | Match m = r.Match(url); |
9033 | if (m.Success) { | 9033 | if (m.Success) { |
9034 | for (int i = 1; i < gnums.Length; i++) { | 9034 | for (int i = 1; i < gnums.Length; i++) { |
9035 | System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; | 9035 | //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; |
9036 | //CaptureCollection cc = g.Captures; | 9036 | //CaptureCollection cc = g.Captures; |
9037 | } | 9037 | } |
9038 | if (m.Groups.Count == 5) { | 9038 | if (m.Groups.Count == 5) { |