diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 14:42:46 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 14:42:46 -0700 |
commit | 59407cdb9c40d96cf0c4fb13ee5f3a59934ef655 (patch) | |
tree | f45910812f862f113881b227158b9ee582f5e3fd /indra/llmessage/llares.cpp | |
parent | 9a196cdda8fa62b90f6f390b21986712d198f03e (diff) | |
parent | a81e91138201f913fc2f1034f7def6d307567f52 (diff) |
merge
Diffstat (limited to 'indra/llmessage/llares.cpp')
-rw-r--r-- | indra/llmessage/llares.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index fe37fe8142..acbf51d75c 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -33,6 +33,7 @@ */ #include "linden_common.h" +#include "llares.h" #include <ares_dns.h> #include <ares_version.h> @@ -42,9 +43,10 @@ #include "apr_poll.h" #include "llapr.h" -#include "llares.h" +#include "llareslistener.h" #if defined(LL_WINDOWS) +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally # define ns_c_in 1 # define NS_HFIXEDSZ 12 /* #/bytes of fixed data in header */ # define NS_QFIXEDSZ 4 /* #/bytes of fixed data in query */ @@ -102,7 +104,9 @@ void LLAres::QueryResponder::queryError(int code) } LLAres::LLAres() : -chan_(NULL), mInitSuccess(false) + chan_(NULL), + mInitSuccess(false), + mListener(new LLAresListener("LLAres", this)) { if (ares_init(&chan_) != ARES_SUCCESS) { |