summaryrefslogtreecommitdiff
path: root/indra/llmessage/llares.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-06-15 11:15:51 +0300
committerMike Antipov <mantipov@productengine.com>2010-06-15 11:15:51 +0300
commitd1cb678bac7805f7ceef1d711c7cb49731d6ccb4 (patch)
tree4c282dfa2da46461cff9135a0af93d18cfe43dff /indra/llmessage/llares.cpp
parent0ec92fb1c8a90d619d0102d0807a32abedc916f1 (diff)
parentb3fc9c79f559c84893dede3ce643ac0dfd1f3d65 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llmessage/llares.cpp')
-rw-r--r--indra/llmessage/llares.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp
index 78561b37aa..5b7e5138ef 100644
--- a/indra/llmessage/llares.cpp
+++ b/indra/llmessage/llares.cpp
@@ -108,7 +108,8 @@ LLAres::LLAres() :
mInitSuccess(false),
mListener(new LLAresListener(this))
{
- if (ares_init(&chan_) != ARES_SUCCESS)
+ if (ares_library_init( ARES_LIB_INIT_ALL ) != ARES_SUCCESS ||
+ ares_init(&chan_) != ARES_SUCCESS)
{
llwarns << "Could not succesfully initialize ares!" << llendl;
return;
@@ -120,6 +121,7 @@ LLAres::LLAres() :
LLAres::~LLAres()
{
ares_destroy(chan_);
+ ares_library_cleanup();
}
void LLAres::cancel()