summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-12-15 21:39:48 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-12-15 21:39:48 -0700
commit4ec112bfce19d4bf09ef79b3b3195dda24148730 (patch)
tree0c195927edef79c271f6a196bf4cdebb43e9e026 /indra/llmessage/llcurl.h
parent2dc7df91ade45d8952473f7de5068e8705440e29 (diff)
fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
SH-2738: Texture fetching freezes due to LLcurl SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
Diffstat (limited to 'indra/llmessage/llcurl.h')
-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 2c95279438..eb814bc608 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -253,6 +253,7 @@ private:
static std::set<CURL*> sFreeHandles;
static std::set<CURL*> sActiveHandles;
+ static LLMutex* sHandleMutexp ;
};
class LLCurl::Multi
@@ -316,6 +317,7 @@ private:
BOOL mDead ;
LLMutex* mMutexp ;
LLMutex* mDeletionMutexp ;
+ LLMutex* mEasyMutexp ;
};
class LLCurlThread : public LLQueuedThread