diff options
Diffstat (limited to '')
8 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index 48db51b..d3cf41e 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | |||
@@ -216,7 +216,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
216 | public IClientAPI RequestUser; | 216 | public IClientAPI RequestUser; |
217 | public LLUUID TransferRequestID; | 217 | public LLUUID TransferRequestID; |
218 | //public bool AssetInCache; | 218 | //public bool AssetInCache; |
219 | //public int TimeRequested; | 219 | //public int TimeRequested; |
220 | 220 | ||
221 | public AssetRequest() | 221 | public AssetRequest() |
222 | { | 222 | { |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs index bae23fa..65785af 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
40 | /// </summary> | 40 | /// </summary> |
41 | public class AgentAssetTransactions | 41 | public class AgentAssetTransactions |
42 | { | 42 | { |
43 | //private static readonly log4net.ILog m_log | 43 | //private static readonly log4net.ILog m_log |
44 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | // Fields | 46 | // Fields |
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
192 | } | 192 | } |
193 | 193 | ||
194 | ourClient.SendConfirmXfer(xferID, packetID); | 194 | ourClient.SendConfirmXfer(xferID, packetID); |
195 | 195 | ||
196 | if ((packetID & 0x80000000) != 0) | 196 | if ((packetID & 0x80000000) != 0) |
197 | { | 197 | { |
198 | SendCompleteMessage(); | 198 | SendCompleteMessage(); |
@@ -209,7 +209,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
209 | /// <param name="xferID"></param> | 209 | /// <param name="xferID"></param> |
210 | /// <param name="packetID"></param> | 210 | /// <param name="packetID"></param> |
211 | /// <param name="data"></param> | 211 | /// <param name="data"></param> |
212 | /// <returns>True if the transfer is complete, false otherwise</returns> | 212 | /// <returns>True if the transfer is complete, false otherwise</returns> |
213 | public bool Initialise(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, | 213 | public bool Initialise(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, |
214 | bool storeLocal, bool tempFile) | 214 | bool storeLocal, bool tempFile) |
215 | { | 215 | { |
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
363 | 363 | ||
364 | private void DoCreateItem() | 364 | private void DoCreateItem() |
365 | { | 365 | { |
366 | //really need to fix this call, if lbsa71 saw this he would die. | 366 | //really need to fix this call, if lbsa71 saw this he would die. |
367 | m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset); | 367 | m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset); |
368 | CachedUserInfo userInfo = | 368 | CachedUserInfo userInfo = |
369 | m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails(ourClient.AgentId); | 369 | m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails(ourClient.AgentId); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs index fcd0e0c..fd407d9 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
199 | 199 | ||
200 | /// <summary> | 200 | /// <summary> |
201 | /// Create an inventory item from data that has been received through a transaction. | 201 | /// Create an inventory item from data that has been received through a transaction. |
202 | /// | 202 | /// |
203 | /// This is called when new clothing or body parts are created. It may also be called in other | 203 | /// This is called when new clothing or body parts are created. It may also be called in other |
204 | /// situations. | 204 | /// situations. |
205 | /// </summary> | 205 | /// </summary> |
@@ -229,8 +229,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
229 | 229 | ||
230 | /// <summary> | 230 | /// <summary> |
231 | /// Update an inventory item with data that has been received through a transaction. | 231 | /// Update an inventory item with data that has been received through a transaction. |
232 | /// | 232 | /// |
233 | /// This is called when clothing or body parts are updated (for instance, with new textures or | 233 | /// This is called when clothing or body parts are updated (for instance, with new textures or |
234 | /// colours). It may also be called in other situations. | 234 | /// colours). It may also be called in other situations. |
235 | /// </summary> | 235 | /// </summary> |
236 | /// <param name="remoteClient"></param> | 236 | /// <param name="remoteClient"></param> |
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); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs index ea84436..be73156 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Region.Environment.Interfaces; | |||
35 | namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | 35 | namespace OpenSim.Region.Environment.Modules.Agent.TextureSender |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// A TextureSender handles the process of receiving a texture requested by the client from the | 38 | /// A TextureSender handles the process of receiving a texture requested by the client from the |
39 | /// AssetCache, and then sending that texture back to the client. | 39 | /// AssetCache, and then sending that texture back to the client. |
40 | /// </summary> | 40 | /// </summary> |
41 | public class TextureSender : ITextureSender | 41 | public class TextureSender : ITextureSender |
@@ -150,14 +150,14 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
150 | { | 150 | { |
151 | if (NumPackets == 0) | 151 | if (NumPackets == 0) |
152 | { | 152 | { |
153 | 153 | ||
154 | RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); | 154 | RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); |
155 | 155 | ||
156 | PacketCounter++; | 156 | PacketCounter++; |
157 | } | 157 | } |
158 | else | 158 | else |
159 | { | 159 | { |
160 | 160 | ||
161 | byte[] ImageData1 = new byte[600]; | 161 | byte[] ImageData1 = new byte[600]; |
162 | Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); | 162 | Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); |
163 | 163 | ||
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
167 | } | 167 | } |
168 | else | 168 | else |
169 | { | 169 | { |
170 | // Doesn't like to be refactored... | 170 | // Doesn't like to be refactored... |
171 | ImagePacketPacket im = new ImagePacketPacket(); | 171 | ImagePacketPacket im = new ImagePacketPacket(); |
172 | im.Header.Reliable = false; | 172 | im.Header.Reliable = false; |
173 | im.ImageID.Packet = (ushort)(PacketCounter); | 173 | im.ImageID.Packet = (ushort)(PacketCounter); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index 1b50bbd..16874d7 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
98 | } | 98 | } |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
101 | /// | 101 | /// |
102 | /// </summary> | 102 | /// </summary> |
103 | /// <param name="remoteClient"></param> | 103 | /// <param name="remoteClient"></param> |
104 | /// <param name="xferID"></param> | 104 | /// <param name="xferID"></param> |