From 26a9a6929c23eabfef0a53355a392fef0ad26b83 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 22 Jul 2011 16:22:51 -0500
Subject: SH-2031 Fix for sometimes deadlocking a curl thread.

---
 indra/llmessage/llcurl.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/llmessage')

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;
-- 
cgit v1.2.3