diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-28 00:26:30 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-28 00:26:30 -0500 |
| commit | cd923af21f4fa6e251dea47ffb53ace934a382d1 (patch) | |
| tree | 67baff77e869579eba6ab1d599f8f48275d516fb /indra/llmessage | |
| parent | c07f55e605253f2cafbdfba1f7bd267d855d3a5f (diff) | |
SH-2183 Fix for multi-threaded curl not playing nice with mesh upload.
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |