summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-12-19 16:55:21 -0600
committerDave Parks <davep@lindenlab.com>2011-12-19 16:55:21 -0600
commit5affaf264da937cdf825bf174c3905a6063b5336 (patch)
tree6a0904781bb154f990853af45dc4c36f5226d7bb /indra
parent58f9982fbc94ed2f039f0cd32579fa572f87e8ba (diff)
SH-2738 Don't lock unless we really need to
Diffstat (limited to 'indra')
-rw-r--r--indra/llmessage/llcurl.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 20f0c6c602..05f3869a11 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -612,13 +612,7 @@ void LLCurl::Multi::setState(LLCurl::Multi::ePerformState state)
LLCurl::Multi::ePerformState LLCurl::Multi::getState()
{
- ePerformState state ;
-
- lock() ;
- state = mState ;
- unlock() ;
-
- return state ;
+ return mState;
}
bool LLCurl::Multi::isCompleted()
@@ -636,14 +630,12 @@ bool LLCurl::Multi::waitToComplete()
bool completed ;
- lock() ;
completed = (STATE_COMPLETED == mState) ;
if(!completed)
{
LLCurl::getCurlThread()->setPriority(mHandle, LLQueuedThread::PRIORITY_URGENT) ;
}
- unlock() ;
-
+
return completed;
}