diff options
author | Diva Canto | 2015-05-05 21:28:27 -0700 |
---|---|---|
committer | Diva Canto | 2015-05-05 21:28:27 -0700 |
commit | 8676b017b24009cc26b274d211d43890594551c1 (patch) | |
tree | 7ead104717ea528a852efa4032c94030b79c252c /OpenSim/Region/ClientStack/Linden | |
parent | Forgot this file in the last commit (diff) | |
download | opensim-SC_OLD-8676b017b24009cc26b274d211d43890594551c1.zip opensim-SC_OLD-8676b017b24009cc26b274d211d43890594551c1.tar.gz opensim-SC_OLD-8676b017b24009cc26b274d211d43890594551c1.tar.bz2 opensim-SC_OLD-8676b017b24009cc26b274d211d43890594551c1.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 053a6a2..e402b0b 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 | |||
201 | 201 | ||
202 | Scene.EventManager.OnRegisterCaps += RegisterCaps; | 202 | Scene.EventManager.OnRegisterCaps += RegisterCaps; |
203 | 203 | ||
204 | int nworkers = 1; // was 2 | ||
204 | if (ProcessQueuedRequestsAsync && m_workerThreads == null) | 205 | if (ProcessQueuedRequestsAsync && m_workerThreads == null) |
205 | { | 206 | { |
206 | m_workerThreads = new Thread[2]; | 207 | m_workerThreads = new Thread[nworkers]; |
207 | 208 | ||
208 | for (uint i = 0; i < 2; i++) | 209 | for (uint i = 0; i < nworkers; i++) |
209 | { | 210 | { |
210 | m_workerThreads[i] = WorkManager.StartThread(DoInventoryRequests, | 211 | m_workerThreads[i] = WorkManager.StartThread(DoInventoryRequests, |
211 | String.Format("InventoryWorkerThread{0}", i), | 212 | String.Format("InventoryWorkerThread{0}", i), |