aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorMelanie2009-10-02 19:02:38 +0100
committerMelanie2009-10-02 19:02:38 +0100
commit6def897556c00e6b7aa04308231a6ee556c22a50 (patch)
treee32867aeca5cd9dea7b03a0602858afc43fac44d /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentMerge branch 'master' into diva-textures (diff)
parent* Changed the flush logic to drop packets in non-transactional streams, and t... (diff)
downloadopensim-SC-6def897556c00e6b7aa04308231a6ee556c22a50.zip
opensim-SC-6def897556c00e6b7aa04308231a6ee556c22a50.tar.gz
opensim-SC-6def897556c00e6b7aa04308231a6ee556c22a50.tar.bz2
opensim-SC-6def897556c00e6b7aa04308231a6ee556c22a50.tar.xz
Merge branch 'diva-textures-osgrid' into diva-textures
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index d8bd36d..3b43771 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3134,26 +3134,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3134 } 3134 }
3135 } 3135 }
3136 3136
3137 // Unlike the other timers, this one is only started after
3138 // the first request is seen.
3139
3140 void HandleQueueEmpty(ThrottleOutPacketType queue) 3137 void HandleQueueEmpty(ThrottleOutPacketType queue)
3141 { 3138 {
3142 switch (queue) 3139 switch (queue)
3143 { 3140 {
3144 case ThrottleOutPacketType.Texture: 3141 case ThrottleOutPacketType.Texture:
3145 ProcessTextureRequests(); 3142 ProcessTextureRequests();
3146 break; 3143 break;
3147 } 3144 }
3148 } 3145 }
3149 3146
3150 void ProcessTextureRequests() 3147 void ProcessTextureRequests()
3151 { 3148 {
3152 if (m_imageManager != null) 3149 if (m_imageManager != null)
3153 { 3150 m_imageManager.ProcessImageQueue(m_textureSendLimit, m_textureDataLimit);
3154 m_imageManager.ProcessImageQueue(m_textureSendLimit,
3155 m_textureDataLimit);
3156 }
3157 } 3151 }
3158 3152
3159 void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e) 3153 void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e)