summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.h
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-09-19 14:50:08 -0400
committerLogan Dethrow <log@lindenlab.com>2011-09-19 14:50:08 -0400
commit5b7b3cbbbbec439880a33af8944d10c7bb527c3a (patch)
tree3e37afeba3e2bb67f53327719de72b4506d2605e /indra/llmessage/llcurl.h
parentc7dd3aac83eb9bde5fe0febaebcd998847bf1889 (diff)
parent2fba01d160716b886a7dfc0c86abda767a25d23f (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