aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
diff options
context:
space:
mode:
authorMelanie2009-10-02 04:04:14 +0100
committerMelanie2009-10-02 04:04:14 +0100
commit18a744cac10c797b67236988a84ab6d13a5543b8 (patch)
tree8333647698a7933ed6def48488380c72084f8360 /OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
parentRemoving console debug spew (diff)
downloadopensim-SC_OLD-18a744cac10c797b67236988a84ab6d13a5543b8.zip
opensim-SC_OLD-18a744cac10c797b67236988a84ab6d13a5543b8.tar.gz
opensim-SC_OLD-18a744cac10c797b67236988a84ab6d13a5543b8.tar.bz2
opensim-SC_OLD-18a744cac10c797b67236988a84ab6d13a5543b8.tar.xz
Change texture sending to be driven by the queue empty event from the
packet queue, rather than a timer
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 70af8e8..1556d01 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -65,6 +65,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
65 m_j2kDecodeModule = pJ2kDecodeModule; 65 m_j2kDecodeModule = pJ2kDecodeModule;
66 } 66 }
67 67
68 public LLClientView Client
69 {
70 get { return m_client; }
71 }
72
68 public void EnqueueReq(TextureRequestArgs newRequest) 73 public void EnqueueReq(TextureRequestArgs newRequest)
69 { 74 {
70 //newRequest is the properties of our new texture fetch request. 75 //newRequest is the properties of our new texture fetch request.
@@ -207,8 +212,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
207 threshold = 10; 212 threshold = 10;
208 213
209 //Uncomment this to see what the texture stack is doing 214 //Uncomment this to see what the texture stack is doing
210 //m_log.Debug("Queue: " + m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount.ToString() + " Threshold: " + threshold.ToString() + " outstanding: " + m_outstandingtextures.ToString()); 215 //m_log.Debug("Queue: " + m_client.PacketHandler.PacketQueue.getQueueCount(ThrottleOutPacketType.Texture).ToString() + " Threshold: " + threshold.ToString() + " outstanding: " + m_outstandingtextures.ToString());
211 if (m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount < threshold) 216 if (m_client.PacketHandler.PacketQueue.GetQueueCount(ThrottleOutPacketType.Texture) < threshold)
212 { 217 {
213 while (m_priorityQueue.Count > 0) 218 while (m_priorityQueue.Count > 0)
214 { 219 {