aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-02 12:00:42 -0700
committerJohn Hurliman2009-10-02 12:00:42 -0700
commit9b342d3e0d85e64e143b9fe1010e4e27135e24ec (patch)
tree1bbf000b036f333cbe8fe10530c749ea6821a739 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentRestore the missing image handling to the image manager. The missing (diff)
downloadopensim-SC_OLD-9b342d3e0d85e64e143b9fe1010e4e27135e24ec.zip
opensim-SC_OLD-9b342d3e0d85e64e143b9fe1010e4e27135e24ec.tar.gz
opensim-SC_OLD-9b342d3e0d85e64e143b9fe1010e4e27135e24ec.tar.bz2
opensim-SC_OLD-9b342d3e0d85e64e143b9fe1010e4e27135e24ec.tar.xz
* Changed the flush logic to drop packets in non-transactional streams, and to not fire any "put more data in the queues" callbacks
* Minor tweaks to code formatting to make the callback chain for packet queuing easier to follow
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 f05c490..43d29fd 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3131,26 +3131,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3131 } 3131 }
3132 } 3132 }
3133 3133
3134 // Unlike the other timers, this one is only started after
3135 // the first request is seen.
3136
3137 void HandleQueueEmpty(ThrottleOutPacketType queue) 3134 void HandleQueueEmpty(ThrottleOutPacketType queue)
3138 { 3135 {
3139 switch (queue) 3136 switch (queue)
3140 { 3137 {
3141 case ThrottleOutPacketType.Texture: 3138 case ThrottleOutPacketType.Texture:
3142 ProcessTextureRequests(); 3139 ProcessTextureRequests();
3143 break; 3140 break;
3144 } 3141 }
3145 } 3142 }
3146 3143
3147 void ProcessTextureRequests() 3144 void ProcessTextureRequests()
3148 { 3145 {
3149 if (m_imageManager != null) 3146 if (m_imageManager != null)
3150 { 3147 m_imageManager.ProcessImageQueue(m_textureSendLimit, m_textureDataLimit);
3151 m_imageManager.ProcessImageQueue(m_textureSendLimit,
3152 m_textureDataLimit);
3153 }
3154 } 3148 }
3155 3149
3156 void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e) 3150 void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e)