summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-07-22 16:22:51 -0500
committerDave Parks <davep@lindenlab.com>2011-07-22 16:22:51 -0500
commit26a9a6929c23eabfef0a53355a392fef0ad26b83 (patch)
tree6a7b35260d8f636b00ff6ff705c15aba7c8ba421 /indra
parente4a8ef4ce2572db98d08233c58e23d3ec75f30d7 (diff)
SH-2031 Fix for sometimes deadlocking a curl thread.
Diffstat (limited to 'indra')
-rw-r--r--indra/llmessage/llcurl.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 1e735c4bbd..0735842dcd 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -683,7 +683,6 @@ void LLCurl::Multi::perform()
{
if (mPerformState == PERFORM_STATE_READY)
{
- mPerformState = PERFORM_STATE_PERFORMING;
mSignal->signal();
}
}
@@ -693,7 +692,7 @@ void LLCurl::Multi::run()
while (!mQuitting)
{
mSignal->wait();
-
+ mPerformState = PERFORM_STATE_PERFORMING;
if (!mQuitting)
{
S32 q = 0;