aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/AssetCache.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetCache.cs')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs23
1 files changed, 17 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 15b52b0..c1f6719 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -250,7 +250,9 @@ namespace OpenSim.Framework.Communications.Cache
250 } 250 }
251 else 251 else
252 { 252 {
253 m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId); 253 #if DEBUG
254 //m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId);
255 #endif
254 256
255 NewAssetRequest req = new NewAssetRequest(assetId, callback); 257 NewAssetRequest req = new NewAssetRequest(assetId, callback);
256 258
@@ -384,14 +386,17 @@ namespace OpenSim.Framework.Communications.Cache
384 } 386 }
385 } 387 }
386 } 388 }
387 389 #if DEBUG
388 m_log.DebugFormat("[ASSET CACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result); 390 //m_log.DebugFormat("[ASSET CACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result);
391 #endif
389 } 392 }
390 393
391 // See IAssetReceiver 394 // See IAssetReceiver
392 public void AssetReceived(AssetBase asset, bool IsTexture) 395 public void AssetReceived(AssetBase asset, bool IsTexture)
393 { 396 {
397 #if DEBUG
394 m_log.DebugFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID); 398 m_log.DebugFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID);
399 #endif
395 400
396 if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server 401 if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server
397 { 402 {
@@ -405,7 +410,9 @@ namespace OpenSim.Framework.Communications.Cache
405 TextureImage image = new TextureImage(asset); 410 TextureImage image = new TextureImage(asset);
406 if (Textures.ContainsKey(image.FullID)) 411 if (Textures.ContainsKey(image.FullID))
407 { 412 {
408 m_log.DebugFormat("[ASSET CACHE]: There's already an texture {0} in memory. Skipping.", asset.FullID); 413 #if DEBUG
414 //m_log.DebugFormat("[ASSET CACHE]: There's already an texture {0} in memory. Skipping.", asset.FullID);
415 #endif
409 } 416 }
410 else 417 else
411 { 418 {
@@ -422,7 +429,9 @@ namespace OpenSim.Framework.Communications.Cache
422 AssetInfo assetInf = new AssetInfo(asset); 429 AssetInfo assetInf = new AssetInfo(asset);
423 if (Assets.ContainsKey(assetInf.FullID)) 430 if (Assets.ContainsKey(assetInf.FullID))
424 { 431 {
425 m_log.DebugFormat("[ASSET CACHE]: There's already an asset {0} in memory. Skipping.", asset.FullID); 432 #if DEBUG
433 //m_log.DebugFormat("[ASSET CACHE]: There's already an asset {0} in memory. Skipping.", asset.FullID);
434 #endif
426 } 435 }
427 else 436 else
428 { 437 {
@@ -435,7 +444,9 @@ namespace OpenSim.Framework.Communications.Cache
435 444
436 if (RequestedAssets.ContainsKey(assetInf.FullID)) 445 if (RequestedAssets.ContainsKey(assetInf.FullID))
437 { 446 {
438 m_log.DebugFormat("[ASSET CACHE]: Moving {0} from RequestedAssets to AssetRequests", asset.FullID); 447 #if DEBUG
448 //m_log.DebugFormat("[ASSET CACHE]: Moving {0} from RequestedAssets to AssetRequests", asset.FullID);
449 #endif
439 450
440 AssetRequest req = RequestedAssets[assetInf.FullID]; 451 AssetRequest req = RequestedAssets[assetInf.FullID];
441 req.AssetInf = assetInf; 452 req.AssetInf = assetInf;