summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-25 14:22:33 -0400
committerOz Linden <oz@lindenlab.com>2012-05-25 14:22:33 -0400
commitee66cb3efccd6976c5a7725620956ea7030b7b57 (patch)
tree7ae469e4d2aac985589e7df902959b27c603b2ad /indra/llmessage/llcurl.cpp
parent5ef8372e433896be174d7123bd4663087601a0df (diff)
parent3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (diff)
merge back beta tags
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 b93d429feb..8ba965e7ed 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -1506,7 +1506,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