OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor changes

0.9.0-post-fixes
UbitUmarov 2017-05-25 04:24:23 +01:00
parent 8195cd5153
commit 65e9421058
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
View File

@ -204,9 +204,12 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
while(true) while(true)
{ {
aPollRequest poolreq = m_queue.Dequeue(); aPollRequest poolreq = m_queue.Dequeue(1000);
if(m_NumberScenes <= 0)
return;
Watchdog.UpdateThread(); Watchdog.UpdateThread();
poolreq.thepoll.Process(poolreq); if(poolreq.reqID != UUID.Zero)
poolreq.thepoll.Process(poolreq);
} }
} }

7
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@ -415,9 +415,12 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
while (true) while (true)
{ {
aPollRequest poolreq = m_queue.Dequeue(); aPollRequest poolreq = m_queue.Dequeue(2000);
if(m_NumberScenes <= 0)
return;
Watchdog.UpdateThread(); Watchdog.UpdateThread();
poolreq.thepoll.Process(poolreq); if(poolreq.reqID != UUID.Zero)
poolreq.thepoll.Process(poolreq);
} }
} }

5
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@ -359,8 +359,9 @@ namespace OpenSim.Services.Connectors
while (true) while (true)
{ {
r = m_requestQueue.Dequeue(); r = m_requestQueue.Dequeue(2000);
if(r== null)
continue;
string uri = r.uri; string uri = r.uri;
string id = r.id; string id = r.id;