diff options
| author | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
| commit | ddd9d1396cd378cbcd332d26d8b6b7092716c1bc (patch) | |
| tree | 767a40da9fdd2f3ae0c89b1d6cd5135884c4e8c9 /indra/viewer_components/updater/llupdatechecker.h | |
| parent | 21ab67416d471a90b343052c986478c9dd65ae79 (diff) | |
| parent | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (diff) | |
merge
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, |