diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
| commit | d020dae7b9c156a08d1dd17eade7f36011f4d0fe (patch) | |
| tree | 67b1a28222116b20c5fa7bcc1cbd86ca47a91aa7 /indra/llmessage/llares.cpp | |
| parent | 745845f79987e4b4ab7f5728746a0eda8898930f (diff) | |
| parent | 70600ea66adc816e72e91e804deebde40ed6b1bc (diff) | |
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
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) { |