summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-28 13:50:35 -0500
committerDave Parks <davep@lindenlab.com>2012-06-28 13:50:35 -0500
commitdb5d1b851a0d808dc1e8b0896fad734c2c54a03f (patch)
treeebe50ddb5e1aa700d54f50bbc1ab4b435462b85e /indra/llmessage/llcurl.cpp
parent1d8f117069945499ac297ef13eb6a916a2b96d72 (diff)
parented72fd0ae98671f1cfce3c975b93e1f760fc40f0 (diff)
merge
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
-rw-r--r--indra/llmessage/llcurl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 5161ee6291..5ea9b58300 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -1527,7 +1527,8 @@ void LLCurl::cleanupClass()
delete sHandleMutexp ;
sHandleMutexp = NULL ;
- llassert(Easy::sActiveHandles.empty());
+ // removed as per https://jira.secondlife.com/browse/SH-3115
+ //llassert(Easy::sActiveHandles.empty());
}
//static