aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/BlockingQueue.cs1
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs4
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 1815330..b99615a1 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Framework
65 65
66 if (m_pqueue.Count > 0) 66 if (m_pqueue.Count > 0)
67 return m_pqueue.Dequeue(); 67 return m_pqueue.Dequeue();
68
68 return m_queue.Dequeue(); 69 return m_queue.Dequeue();
69 } 70 }
70 } 71 }
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 7bb2ab9..1d0c030 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -214,9 +214,7 @@ namespace OpenSim.Framework.Communications.Cache
214 req.IsTexture = isTexture; 214 req.IsTexture = isTexture;
215 m_assetRequests.Enqueue(req); 215 m_assetRequests.Enqueue(req);
216 216
217 #if DEBUG 217 //m_log.DebugFormat("[ASSET SERVER]: Added {0} to request queue", assetID);
218 //m_log.InfoFormat("[ASSET SERVER]: Added {0} to request queue", assetID);
219 #endif
220 } 218 }
221 219
222 public virtual void UpdateAsset(AssetBase asset) 220 public virtual void UpdateAsset(AssetBase asset)