aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-20 17:34:10 +0000
committerJustin Clarke Casey2008-02-20 17:34:10 +0000
commit877713999ce9bcf63e9fafa76cc7d2283ee2e6c2 (patch)
treea777abaadb3556af6933a5ac6fa85af6647629ed /OpenSim/Framework/Communications/Cache/AssetServerBase.cs
parentllSetTimerEvent was setting seconds as milliseconds causing major problems in... (diff)
downloadopensim-SC_OLD-877713999ce9bcf63e9fafa76cc7d2283ee2e6c2.zip
opensim-SC_OLD-877713999ce9bcf63e9fafa76cc7d2283ee2e6c2.tar.gz
opensim-SC_OLD-877713999ce9bcf63e9fafa76cc7d2283ee2e6c2.tar.bz2
opensim-SC_OLD-877713999ce9bcf63e9fafa76cc7d2283ee2e6c2.tar.xz
* Report 'asset not found' situations back to UserTextureDownloadService
* This fixes some of the 'runaway downloads' problem but not all of it * Also fix up logging messages so texture requests are reported as such rather than as assets
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetServerBase.cs')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 9d9bc1e..8e670b5 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -37,7 +37,8 @@ namespace OpenSim.Framework.Communications.Cache
37{ 37{
38 public abstract class AssetServerBase : IAssetServer 38 public abstract class AssetServerBase : IAssetServer
39 { 39 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly log4net.ILog m_log
41 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
41 42
42 protected IAssetReceiver m_receiver; 43 protected IAssetReceiver m_receiver;
43 protected BlockingQueue<AssetRequest> m_assetRequests; 44 protected BlockingQueue<AssetRequest> m_assetRequests;
@@ -70,13 +71,13 @@ namespace OpenSim.Framework.Communications.Cache
70 71
71 if (asset != null) 72 if (asset != null)
72 { 73 {
73 //m_log.InfoFormat("[ASSET]: Asset {0} received from asset server", req.AssetID); 74 //m_log.InfoFormat("[ASSETSERVER]: Asset {0} received from asset server", req.AssetID);
74 75
75 m_receiver.AssetReceived(asset, req.IsTexture); 76 m_receiver.AssetReceived(asset, req.IsTexture);
76 } 77 }
77 else 78 else
78 { 79 {
79 m_log.ErrorFormat("[ASSET]: Asset {0} not found by asset server", req.AssetID); 80 m_log.ErrorFormat("[ASSETSERVER]: Asset {0} not found by asset server", req.AssetID);
80 81
81 m_receiver.AssetNotFound(req.AssetID); 82 m_receiver.AssetNotFound(req.AssetID);
82 } 83 }
@@ -131,7 +132,7 @@ namespace OpenSim.Framework.Communications.Cache
131 req.IsTexture = isTexture; 132 req.IsTexture = isTexture;
132 m_assetRequests.Enqueue(req); 133 m_assetRequests.Enqueue(req);
133 134
134 m_log.InfoFormat("[ASSET]: Added {0} to request queue", assetID); 135 m_log.InfoFormat("[ASSETSERVER]: Added {0} to request queue", assetID);
135 } 136 }
136 137
137 public virtual void UpdateAsset(AssetBase asset) 138 public virtual void UpdateAsset(AssetBase asset)