From 7d7ad4dff205faf64116defdc25f2d484cd04589 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 20 Feb 2008 20:23:03 +0000 Subject: * 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 --- OpenSim/Framework/Communications/Cache/AssetCache.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'OpenSim/Framework') 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 } else { + m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId); + NewAssetRequest req = new NewAssetRequest(assetId, callback); // Make sure we always have a request list to which to add the asset @@ -265,11 +267,10 @@ namespace OpenSim.Framework.Communications.Cache } } - m_log.DebugFormat("[ASSET CACHE]: Added request for {0} {1}", isTexture ? "texture" : "asset", assetId); requestList.Requests.Add(req); m_assetServer.RequestAsset(assetId, isTexture); - } + } } /// @@ -383,7 +384,7 @@ namespace OpenSim.Framework.Communications.Cache } } - m_log.InfoFormat("[ASSET CACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result); + m_log.DebugFormat("[ASSET CACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result); } /// @@ -411,7 +412,7 @@ namespace OpenSim.Framework.Communications.Cache // See IAssetReceiver public void AssetReceived(AssetBase asset, bool IsTexture) { - m_log.InfoFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID); + m_log.DebugFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID); if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server { @@ -425,7 +426,7 @@ namespace OpenSim.Framework.Communications.Cache TextureImage image = new TextureImage(asset); if (Textures.ContainsKey(image.FullID)) { - m_log.InfoFormat("[ASSET CACHE]: There's already an texture {0} in memory. Skipping.", asset.FullID); + m_log.DebugFormat("[ASSET CACHE]: There's already an texture {0} in memory. Skipping.", asset.FullID); } else { -- cgit v1.1