aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs3
3 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 03f0a04..a721454 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -204,10 +204,10 @@ namespace OpenSim.Region.ClientStack.Linden
204 { 204 {
205 while(true) 205 while(true)
206 { 206 {
207 aPollRequest poolreq = m_queue.Dequeue(1000); 207 aPollRequest poolreq = m_queue.Dequeue(4500);
208 Watchdog.UpdateThread();
208 if(m_NumberScenes <= 0) 209 if(m_NumberScenes <= 0)
209 return; 210 return;
210 Watchdog.UpdateThread();
211 if(poolreq.reqID != UUID.Zero) 211 if(poolreq.reqID != UUID.Zero)
212 poolreq.thepoll.Process(poolreq); 212 poolreq.thepoll.Process(poolreq);
213 } 213 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 8ef943c..ce9798b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -415,10 +415,10 @@ namespace OpenSim.Region.ClientStack.Linden
415 { 415 {
416 while (true) 416 while (true)
417 { 417 {
418 aPollRequest poolreq = m_queue.Dequeue(2000); 418 aPollRequest poolreq = m_queue.Dequeue(4500);
419 Watchdog.UpdateThread();
419 if(m_NumberScenes <= 0) 420 if(m_NumberScenes <= 0)
420 return; 421 return;
421 Watchdog.UpdateThread();
422 if(poolreq.reqID != UUID.Zero) 422 if(poolreq.reqID != UUID.Zero)
423 poolreq.thepoll.Process(poolreq); 423 poolreq.thepoll.Process(poolreq);
424 } 424 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 23ec141..a367426 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -443,10 +443,9 @@ namespace OpenSim.Region.ClientStack.Linden
443 { 443 {
444 while (true) 444 while (true)
445 { 445 {
446 aPollRequest poolreq = m_queue.Dequeue(4500);
446 Watchdog.UpdateThread(); 447 Watchdog.UpdateThread();
447 448
448 aPollRequest poolreq = m_queue.Dequeue(5000);
449
450 if (poolreq != null && poolreq.thepoll != null) 449 if (poolreq != null && poolreq.thepoll != null)
451 { 450 {
452 try 451 try