diff options
Diffstat (limited to 'indra/viewer_components')
-rwxr-xr-x | indra/viewer_components/updater/llupdatechecker.cpp | 12 | ||||
-rwxr-xr-x | indra/viewer_components/updater/llupdatechecker.h | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp index dc8ff2f644..8da4f88905 100755 --- a/indra/viewer_components/updater/llupdatechecker.cpp +++ b/indra/viewer_components/updater/llupdatechecker.cpp @@ -130,12 +130,13 @@ void LLUpdateChecker::Implementation::checkVersion(std::string const & urlBase, } } -void LLUpdateChecker::Implementation::completed(U32 status, - const std::string & reason, - const LLSD & content) +void LLUpdateChecker::Implementation::httpCompleted() { mInProgress = false; - + + S32 status = getStatus(); + const LLSD& content = getContent(); + const std::string& reason = getReason(); if(status != 200) { std::string server_error; @@ -162,8 +163,9 @@ void LLUpdateChecker::Implementation::completed(U32 status, } -void LLUpdateChecker::Implementation::error(U32 status, const std::string & reason) +void LLUpdateChecker::Implementation::httpFailure() { + const std::string& reason = getReason(); mInProgress = false; LL_WARNS("UpdaterService") << "update check failed; " << reason << LL_ENDL; mClient.error(reason); diff --git a/indra/viewer_components/updater/llupdatechecker.h b/indra/viewer_components/updater/llupdatechecker.h index 4244007340..3163a6d53c 100755 --- a/indra/viewer_components/updater/llupdatechecker.h +++ b/indra/viewer_components/updater/llupdatechecker.h @@ -52,11 +52,10 @@ public: bool willing_to_test ); + protected: // Responder: - virtual void completed(U32 status, - const std::string & reason, - const LLSD& content); - virtual void error(U32 status, const std::string & reason); + virtual void httpCompleted(); + virtual void httpFailure(); private: static const char * sLegacyProtocolVersion; |