aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-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 27db72c..414b9bf 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -203,10 +203,10 @@ namespace OpenSim.Region.ClientStack.Linden
203 { 203 {
204 while(true) 204 while(true)
205 { 205 {
206 aPollRequest poolreq = m_queue.Dequeue(1000); 206 aPollRequest poolreq = m_queue.Dequeue(4500);
207 Watchdog.UpdateThread();
207 if(m_NumberScenes <= 0) 208 if(m_NumberScenes <= 0)
208 return; 209 return;
209 Watchdog.UpdateThread();
210 if(poolreq.reqID != UUID.Zero) 210 if(poolreq.reqID != UUID.Zero)
211 poolreq.thepoll.Process(poolreq); 211 poolreq.thepoll.Process(poolreq);
212 } 212 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index d6b4873..1a31157 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -445,10 +445,10 @@ namespace OpenSim.Region.ClientStack.Linden
445 { 445 {
446 while (true) 446 while (true)
447 { 447 {
448 aPollRequest poolreq = m_queue.Dequeue(2000); 448 aPollRequest poolreq = m_queue.Dequeue(4500);
449 Watchdog.UpdateThread();
449 if(m_NumberScenes <= 0) 450 if(m_NumberScenes <= 0)
450 return; 451 return;
451 Watchdog.UpdateThread();
452 if(poolreq.reqID != UUID.Zero) 452 if(poolreq.reqID != UUID.Zero)
453 poolreq.thepoll.Process(poolreq); 453 poolreq.thepoll.Process(poolreq);
454 } 454 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 422c354..5011c44 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -479,10 +479,9 @@ namespace OpenSim.Region.ClientStack.Linden
479 { 479 {
480 while (true) 480 while (true)
481 { 481 {
482 aPollRequest poolreq = m_queue.Dequeue(4500);
482 Watchdog.UpdateThread(); 483 Watchdog.UpdateThread();
483 484
484 aPollRequest poolreq = m_queue.Dequeue(5000);
485
486 if (poolreq != null && poolreq.thepoll != null) 485 if (poolreq != null && poolreq.thepoll != null)
487 { 486 {
488 try 487 try