diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
| commit | d725e5b24075b2171f8a5b263969991e9b475078 (patch) | |
| tree | f1422064fd0ab676dfa66d39b5d0f0b9e8ff1086 /indra/llmessage | |
| parent | 66739da16407a8e56accc236bd3996c1963a6bcf (diff) | |
QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llares.cpp | 11 | ||||
| -rw-r--r-- | indra/llmessage/llares.h | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index d11f227c21..c4c19b8fbd 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -100,9 +100,16 @@ void LLAres::QueryResponder::queryError(int code) << LLAres::strerror(code) << llendl; } -LLAres::LLAres() +LLAres::LLAres() : +chan_(NULL), mInitSuccess(false) { - ares_init(&chan_); + if (ares_init(&chan_) != ARES_SUCCESS) + { + llwarns << "Could not succesfully initialize ares!" << llendl; + return; + } + + mInitSuccess = true; } LLAres::~LLAres() diff --git a/indra/llmessage/llares.h b/indra/llmessage/llares.h index 4dd65600cc..3e6b0b0e84 100644 --- a/indra/llmessage/llares.h +++ b/indra/llmessage/llares.h @@ -437,9 +437,11 @@ public: */ static const char *strerror(int code); + bool isInitialized(void) { return mInitSuccess; } + protected: ares_channel chan_; - + bool mInitSuccess; }; /** |