diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-06-14 14:33:46 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-06-14 14:33:46 -0700 |
| commit | 5f640843134a255536638df357fbbd2d3845858e (patch) | |
| tree | b671462f287e622cc5e3358810adc67b960d8cfa | |
| parent | baf9b3cb078c04b019fccc4ae8a54db05b14bdef (diff) | |
| parent | dc446700e3bf41ddb93602013285177996b66bd5 (diff) | |
Merge.
| -rw-r--r-- | indra/llmessage/llares.cpp | 4 |
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() |