summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-16 09:13:38 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-16 09:13:38 -0400
commitac918730bee5d2970e2df0edaa544168486e6e54 (patch)
tree222639d254108403d20b47657063670daaad35bd /indra/llmessage/llcurl.h
parent7f10e89ce919ad35907cd4237a78b831375ffb75 (diff)
parent1a0865a57220434a49b106a47170c3dae45dcb13 (diff)
merge
Diffstat (limited to 'indra/llmessage/llcurl.h')
-rwxr-xr-x[-rw-r--r--]indra/llmessage/llcurl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index 213b281e72..87de202717 100644..100755
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -232,6 +232,7 @@ public:
private:
friend class LLCurl;
+ friend class LLCurl::Multi;
CURL* mCurlEasyHandle;
struct curl_slist* mHeaders;
@@ -251,6 +252,7 @@ private:
static std::set<CURL*> sFreeHandles;
static std::set<CURL*> sActiveHandles;
static LLMutex* sHandleMutex;
+ static LLMutex* sMultiMutex;
};
class LLCurl::Multi : public LLThread