diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-26 14:31:53 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-26 14:31:53 -0700 |
| commit | 6e410c31c4f84247586312fa7763a2eb3a8db9da (patch) | |
| tree | 9540cc49b0c7aabd56869feaa9fbf48b34f12f2e /indra/viewer_components/updater/llupdatechecker.h | |
| parent | 8675ed0491efee860ac1b2d1d5fe88d150768217 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge the CHUIstorm 3.6.5
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, |