Attempt at fixing mantis #7054. The two inventory threads are stepping on each other's feet. This needs real-world testing, as I'm not sure of all the consequences of reducing the number of worker threads to 1.

inv-download
Diva Canto 2015-05-05 21:28:27 -07:00
parent 1192ca36e9
commit 8676b017b2
1 changed files with 3 additions and 2 deletions

View File

@ -201,11 +201,12 @@ namespace OpenSim.Region.ClientStack.Linden
Scene.EventManager.OnRegisterCaps += RegisterCaps; Scene.EventManager.OnRegisterCaps += RegisterCaps;
int nworkers = 1; // was 2
if (ProcessQueuedRequestsAsync && m_workerThreads == null) if (ProcessQueuedRequestsAsync && m_workerThreads == null)
{ {
m_workerThreads = new Thread[2]; m_workerThreads = new Thread[nworkers];
for (uint i = 0; i < 2; i++) for (uint i = 0; i < nworkers; i++)
{ {
m_workerThreads[i] = WorkManager.StartThread(DoInventoryRequests, m_workerThreads[i] = WorkManager.StartThread(DoInventoryRequests,
String.Format("InventoryWorkerThread{0}", i), String.Format("InventoryWorkerThread{0}", i),