diff options
Diffstat (limited to '')
3 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 474ac75..8f81f3d 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
38 | { | 38 | { |
39 | public class TextureDownloadModule : IRegionModule | 39 | public class TextureDownloadModule : IRegionModule |
40 | { | 40 | { |
41 | //private static readonly log4net.ILog m_log | 41 | //private static readonly log4net.ILog m_log |
42 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 42 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | /// <summary> | 44 | /// <summary> |
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
212 | private void TextureSent(ITextureSender sender) | 212 | private void TextureSent(ITextureSender sender) |
213 | { | 213 | { |
214 | sender.Sending = false; | 214 | sender.Sending = false; |
215 | //m_log.DebugFormat("[TEXTURE DOWNLOAD]: Removing download stat for {0}", sender.assetID); | 215 | //m_log.DebugFormat("[TEXTURE DOWNLOAD]: Removing download stat for {0}", sender.assetID); |
216 | m_scene.AddPendingDownloads(-1); | 216 | m_scene.AddPendingDownloads(-1); |
217 | } | 217 | } |
218 | } | 218 | } |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 70e44d4..7c187c0 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
37 | /// </summary> | 37 | /// </summary> |
38 | public class TextureNotFoundSender : ITextureSender | 38 | public class TextureNotFoundSender : ITextureSender |
39 | { | 39 | { |
40 | //private static readonly log4net.ILog m_log | 40 | //private static readonly log4net.ILog m_log |
41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | private bool m_cancel = false; | 43 | private bool m_cancel = false; |
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
80 | public bool SendTexturePacket() | 80 | public bool SendTexturePacket() |
81 | { | 81 | { |
82 | //m_log.InfoFormat( | 82 | //m_log.InfoFormat( |
83 | // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", | 83 | // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", |
84 | // m_textureId); | 84 | // m_textureId); |
85 | 85 | ||
86 | ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); | 86 | ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index d4fa39f..42624ad 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// This module sets up texture senders in response to client texture requests, and places them on a | 41 | /// This module sets up texture senders in response to client texture requests, and places them on a |
42 | /// processing queue once those senders have the appropriate data (i.e. a texture retrieved from the | 42 | /// processing queue once those senders have the appropriate data (i.e. a texture retrieved from the |
43 | /// asset cache). | 43 | /// asset cache). |
44 | /// </summary> | 44 | /// </summary> |
45 | public class UserTextureDownloadService | 45 | public class UserTextureDownloadService |
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
49 | 49 | ||
50 | /// <summary> | 50 | /// <summary> |
51 | /// We will allow the client to request the same texture n times before dropping further requests | 51 | /// We will allow the client to request the same texture n times before dropping further requests |
52 | /// | 52 | /// |
53 | /// This number includes repeated requests for the same texture at different resolutions (which we don't | 53 | /// This number includes repeated requests for the same texture at different resolutions (which we don't |
54 | /// currently handle properly as far as I know). However, this situation should be handled in a more | 54 | /// currently handle properly as far as I know). However, this situation should be handled in a more |
55 | /// sophisticated way. | 55 | /// sophisticated way. |
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
80 | /// We're going to limit requests for the same missing texture. | 80 | /// We're going to limit requests for the same missing texture. |
81 | /// XXX This is really a temporary solution to deal with the situation where a client continually requests | 81 | /// XXX This is really a temporary solution to deal with the situation where a client continually requests |
82 | /// the same missing textures | 82 | /// the same missing textures |
83 | /// </summary> | 83 | /// </summary> |
84 | private readonly IRequestLimitStrategy<LLUUID> missingTextureLimitStrategy | 84 | private readonly IRequestLimitStrategy<LLUUID> missingTextureLimitStrategy |
85 | = new RepeatLimitStrategy<LLUUID>(MAX_ALLOWED_TEXTURE_REQUESTS); | 85 | = new RepeatLimitStrategy<LLUUID>(MAX_ALLOWED_TEXTURE_REQUESTS); |
86 | 86 | ||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
93 | } | 93 | } |
94 | 94 | ||
95 | /// <summary> | 95 | /// <summary> |
96 | /// Handle a texture request. This involves creating a texture sender and placing it on the | 96 | /// Handle a texture request. This involves creating a texture sender and placing it on the |
97 | /// previously passed in shared queue. | 97 | /// previously passed in shared queue. |
98 | /// </summary> | 98 | /// </summary> |
99 | /// <param name="e"></param> | 99 | /// <param name="e"></param> |
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
108 | { | 108 | { |
109 | if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender)) | 109 | if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender)) |
110 | { | 110 | { |
111 | // If we've received new non UUID information for this request and it hasn't dispatched | 111 | // If we've received new non UUID information for this request and it hasn't dispatched |
112 | // yet, then update the request accordingly. | 112 | // yet, then update the request accordingly. |
113 | textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber); | 113 | textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber); |
114 | } | 114 | } |
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
117 | if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) | 117 | if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) |
118 | { | 118 | { |
119 | // m_log.DebugFormat( | 119 | // m_log.DebugFormat( |
120 | // "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}", | 120 | // "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}", |
121 | // e.RequestedAssetID, m_client.AgentId); | 121 | // e.RequestedAssetID, m_client.AgentId); |
122 | 122 | ||
123 | return; | 123 | return; |
@@ -128,9 +128,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
128 | { | 128 | { |
129 | if (StatsManager.SimExtraStats != null) | 129 | if (StatsManager.SimExtraStats != null) |
130 | StatsManager.SimExtraStats.AddBlockedMissingTextureRequest(); | 130 | StatsManager.SimExtraStats.AddBlockedMissingTextureRequest(); |
131 | 131 | ||
132 | // Commenting out this message for now as it causes too much noise with other | 132 | // Commenting out this message for now as it causes too much noise with other |
133 | // debug messages. | 133 | // debug messages. |
134 | // m_log.DebugFormat( | 134 | // m_log.DebugFormat( |
135 | // "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", | 135 | // "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", |
136 | // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); | 136 | // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); |