summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-01-17 22:56:28 -0700
committerXiaohong Bao <bao@lindenlab.com>2012-01-17 22:56:28 -0700
commit25c21c3761d871fa7927e2a5656ed18100084454 (patch)
tree918bfa17008642a8510b666c07dccf45295eee07 /indra/llmessage/llcurl.cpp
parenta6c638d882919b58186a6859644d61cdb5e45a7b (diff)
add more exception handlings for llcurl fix.
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
-rw-r--r--indra/llmessage/llcurl.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 277c274f52..5edf0dc8c0 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -1036,7 +1036,12 @@ LLCurl::Easy* LLCurlRequest::allocEasy()
{
addMulti();
}
- llassert_always(mActiveMulti);
+ if(!mActiveMulti)
+ {
+ return NULL ;
+ }
+
+ //llassert_always(mActiveMulti);
++mActiveRequestCount;
LLCurl::Easy* easy = mActiveMulti->allocEasy();
return easy;