From cd923af21f4fa6e251dea47ffb53ace934a382d1 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 28 Jul 2011 00:26:30 -0500 Subject: SH-2183 Fix for multi-threaded curl not playing nice with mesh upload. --- indra/llmessage/llcurl.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra') diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 9484f572f6..b7208f3e19 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -1006,6 +1006,10 @@ S32 LLCurlRequest::getQueued() curlmulti_set_t::iterator curiter = iter++; LLCurl::Multi* multi = *curiter; queued += multi->mQueued; + if (multi->mPerformState != LLCurl::Multi::PERFORM_STATE_READY) + { + ++queued; + } } return queued; } -- cgit v1.2.3