From 8676b017b24009cc26b274d211d43890594551c1 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 5 May 2015 21:28:27 -0700 Subject: [PATCH] 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. --- .../Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 053a6a234a..e402b0b784 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs @@ -201,11 +201,12 @@ namespace OpenSim.Region.ClientStack.Linden Scene.EventManager.OnRegisterCaps += RegisterCaps; + int nworkers = 1; // was 2 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, String.Format("InventoryWorkerThread{0}", i),