3 files changed, 13 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 3e10335..03f0a04 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -204,9 +204,12 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             while(true)
             {
-                aPollRequest poolreq = m_queue.Dequeue();
+                aPollRequest poolreq = m_queue.Dequeue(1000);
+                if(m_NumberScenes <= 0)
+                    return;
                 Watchdog.UpdateThread();
-                poolreq.thepoll.Process(poolreq);
+                if(poolreq.reqID != UUID.Zero)
+                    poolreq.thepoll.Process(poolreq);
             }
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index a9e8cf9..8ef943c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -415,9 +415,12 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             while (true)
             {
-                aPollRequest poolreq = m_queue.Dequeue();
+                aPollRequest poolreq = m_queue.Dequeue(2000);
+                if(m_NumberScenes <= 0)
+                    return;
                 Watchdog.UpdateThread();
-                poolreq.thepoll.Process(poolreq);
+                if(poolreq.reqID != UUID.Zero)
+                    poolreq.thepoll.Process(poolreq);
             }
         }
 
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 46cd727..62d13fc 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -359,8 +359,9 @@ namespace OpenSim.Services.Connectors
 
             while (true)
             {
-                r = m_requestQueue.Dequeue();
-
+                r = m_requestQueue.Dequeue(2000);
+                if(r== null)
+                    continue;
                 string uri = r.uri;
                 string id = r.id;