diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index d988032..fe25eca 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -193,6 +193,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
193 | /// </summary> | 193 | /// </summary> |
194 | /// <param name="assetId"></param> | 194 | /// <param name="assetId"></param> |
195 | /// <param name="callback"> | 195 | /// <param name="callback"> |
196 | /// <param name="isTexture"></param> | ||
196 | /// A callback invoked when the asset has either been found or not found. | 197 | /// A callback invoked when the asset has either been found or not found. |
197 | /// If the asset was found this is called with the asset UUID and the asset data | 198 | /// If the asset was found this is called with the asset UUID and the asset data |
198 | /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param> | 199 | /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param> |
@@ -260,7 +261,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
260 | { | 261 | { |
261 | // I'm not going over 3 seconds since this will be blocking processing of all the other inbound | 262 | // I'm not going over 3 seconds since this will be blocking processing of all the other inbound |
262 | // packets from the client. | 263 | // packets from the client. |
263 | int pollPeriod = 200; | 264 | const int pollPeriod = 200; |
264 | int maxPolls = 15; | 265 | int maxPolls = 15; |
265 | 266 | ||
266 | AssetBase asset; | 267 | AssetBase asset; |
@@ -528,18 +529,18 @@ namespace OpenSim.Framework.Communications.Cache | |||
528 | AssetRequestToClient req2 = null; | 529 | AssetRequestToClient req2 = null; |
529 | for (int i = 0; i < num; i++) | 530 | for (int i = 0; i < num; i++) |
530 | { | 531 | { |
531 | req = (AssetRequest)AssetRequests[i]; | 532 | req = AssetRequests[i]; |
532 | if (req2 == null) | 533 | if (req2 == null) |
533 | { | 534 | { |
534 | req2 = new AssetRequestToClient(); | 535 | req2 = new AssetRequestToClient(); |
535 | } | 536 | } |
536 | // Trying to limit memory usage by only creating AssetRequestToClient if needed | 537 | // Trying to limit memory usage by only creating AssetRequestToClient if needed |
537 | //req2 = new AssetRequestToClient(); | 538 | //req2 = new AssetRequestToClient(); |
538 | req2.AssetInf = (AssetBase)req.AssetInf; | 539 | req2.AssetInf = req.AssetInf; |
539 | req2.AssetRequestSource = req.AssetRequestSource; | 540 | req2.AssetRequestSource = req.AssetRequestSource; |
540 | req2.DataPointer = req.DataPointer; | 541 | req2.DataPointer = req.DataPointer; |
541 | req2.DiscardLevel = req.DiscardLevel; | 542 | req2.DiscardLevel = req.DiscardLevel; |
542 | req2.ImageInfo = (AssetBase)req.ImageInfo; | 543 | req2.ImageInfo = req.ImageInfo; |
543 | req2.IsTextureRequest = req.IsTextureRequest; | 544 | req2.IsTextureRequest = req.IsTextureRequest; |
544 | req2.NumPackets = req.NumPackets; | 545 | req2.NumPackets = req.NumPackets; |
545 | req2.PacketCounter = req.PacketCounter; | 546 | req2.PacketCounter = req.PacketCounter; |