diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:15:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:15:15 -0400 |
| commit | 82bf4e4db2bdb9effdf64e9edaa76a78913e25d3 (patch) | |
| tree | 7f44a97fdf51222e743e18464d1b2d0ccb5b830e /indra/viewer_components/updater/llupdatechecker.h | |
| parent | 731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (diff) | |
| parent | 86b4019684af96a64a1d439851f177d7c18e4c24 (diff) | |
merge changes for DRTVWR-285
Diffstat (limited to 'indra/viewer_components/updater/llupdatechecker.h')
| -rwxr-xr-x | indra/viewer_components/updater/llupdatechecker.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/viewer_components/updater/llupdatechecker.h b/indra/viewer_components/updater/llupdatechecker.h index 8e85587490..4244007340 100755 --- a/indra/viewer_components/updater/llupdatechecker.h +++ b/indra/viewer_components/updater/llupdatechecker.h @@ -43,8 +43,7 @@ public: public: Implementation(Client & client); ~Implementation(); - void checkVersion(std::string const & hostUrl, - std::string const & servicePath, + void checkVersion(std::string const & urlBase, std::string const & channel, std::string const & version, std::string const & platform, @@ -68,16 +67,14 @@ public: LLHTTPClient mHttpClient; bool mInProgress; std::string mVersion; - std::string mHostUrl; - std::string mServicePath; + std::string mUrlBase; std::string mChannel; std::string mPlatform; std::string mPlatformVersion; unsigned char mUniqueId[MD5HEX_STR_SIZE]; bool mWillingToTest; - std::string buildUrl(std::string const & hostUrl, - std::string const & servicePath, + std::string buildUrl(std::string const & urlBase, std::string const & channel, std::string const & version, std::string const & platform, @@ -95,8 +92,7 @@ public: LLUpdateChecker(Client & client); // Check status of current app on the given host for the channel and version provided. - void checkVersion(std::string const & hostUrl, - std::string const & servicePath, + void checkVersion(std::string const & urlBase, std::string const & channel, std::string const & version, std::string const & platform, |