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

Merge branch 'master' of opensimulator.org:/var/git/opensim

LSLKeyTest
UbitUmarov 2015-11-25 03:22:20 +00:00
parent 583c874773 774ac5e96b
commit 1484348d7f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Monitoring/JobEngine.cs
View File

@ -76,7 +76,7 @@ namespace OpenSim.Framework.Monitoring
/// </remarks> /// </remarks>
private bool m_warnOverMaxQueue = true; private bool m_warnOverMaxQueue = true;
private BlockingCollection<Job> m_jobQueue; private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
private CancellationTokenSource m_cancelSource; private CancellationTokenSource m_cancelSource;
@ -104,7 +104,6 @@ namespace OpenSim.Framework.Monitoring
m_finishedProcessingAfterStop.Reset(); m_finishedProcessingAfterStop.Reset();
m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
m_cancelSource = new CancellationTokenSource(); m_cancelSource = new CancellationTokenSource();
WorkManager.StartThread( WorkManager.StartThread(