aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-20 20:23:03 +0000
committerJustin Clarke Casey2008-02-20 20:23:03 +0000
commit7d7ad4dff205faf64116defdc25f2d484cd04589 (patch)
treeb7726896da3f01708cb478117b3e908f5d6d269c /OpenSim/Framework
parentdiv+ (diff)
downloadopensim-SC_OLD-7d7ad4dff205faf64116defdc25f2d484cd04589.zip
opensim-SC_OLD-7d7ad4dff205faf64116defdc25f2d484cd04589.tar.gz
opensim-SC_OLD-7d7ad4dff205faf64116defdc25f2d484cd04589.tar.bz2
opensim-SC_OLD-7d7ad4dff205faf64116defdc25f2d484cd04589.tar.xz
* Only count download requests for assets which are not already waiting for data from the asset server
* This should stop the constant increase in the download requests statistics * If you see stat numbers for download requests which are far from what you'd expect, please report
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0e31e95..5e6bd5f 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -249,6 +249,8 @@ namespace OpenSim.Framework.Communications.Cache
249 } 249 }
250 else 250 else
251 { 251 {
252 m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId);
253
252 NewAssetRequest req = new NewAssetRequest(assetId, callback); 254 NewAssetRequest req = new NewAssetRequest(assetId, callback);
253 255
254 // Make sure we always have a request list to which to add the asset 256 // Make sure we always have a request list to which to add the asset
@@ -265,11 +267,10 @@ namespace OpenSim.Framework.Communications.Cache
265 } 267 }
266 } 268 }
267 269
268 m_log.DebugFormat("[ASSET CACHE]: Added request for {0} {1}", isTexture ? "texture" : "asset", assetId);
269 requestList.Requests.Add(req); 270 requestList.Requests.Add(req);
270 271
271 m_assetServer.RequestAsset(assetId, isTexture); 272 m_assetServer.RequestAsset(assetId, isTexture);
272 } 273 }
273 } 274 }
274 275
275 /// <summary> 276 /// <summary>
@@ -383,7 +384,7 @@ namespace OpenSim.Framework.Communications.Cache
383 } 384 }
384 } 385 }
385 386
386 m_log.InfoFormat("[ASSET CACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result); 387 m_log.DebugFormat("[ASSET CACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result);
387 } 388 }
388 389
389 /// <summary> 390 /// <summary>
@@ -411,7 +412,7 @@ namespace OpenSim.Framework.Communications.Cache
411 // See IAssetReceiver 412 // See IAssetReceiver
412 public void AssetReceived(AssetBase asset, bool IsTexture) 413 public void AssetReceived(AssetBase asset, bool IsTexture)
413 { 414 {
414 m_log.InfoFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID); 415 m_log.DebugFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID);
415 416
416 if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server 417 if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server
417 { 418 {
@@ -425,7 +426,7 @@ namespace OpenSim.Framework.Communications.Cache
425 TextureImage image = new TextureImage(asset); 426 TextureImage image = new TextureImage(asset);
426 if (Textures.ContainsKey(image.FullID)) 427 if (Textures.ContainsKey(image.FullID))
427 { 428 {
428 m_log.InfoFormat("[ASSET CACHE]: There's already an texture {0} in memory. Skipping.", asset.FullID); 429 m_log.DebugFormat("[ASSET CACHE]: There's already an texture {0} in memory. Skipping.", asset.FullID);
429 } 430 }
430 else 431 else
431 { 432 {