summaryrefslogtreecommitdiff
path: root/indra/viewer_components/updater/llupdatechecker.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-07-09 08:39:22 -0700
committerOz Linden <oz@lindenlab.com>2013-07-09 08:39:22 -0700
commit34c77159f7dea117eb69fe013b09f2719b12e612 (patch)
tree881783048f392ba88297a3c8dbdd7f3ef8195f4d /indra/viewer_components/updater/llupdatechecker.h
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
CHOP-963: Make update service query url depend on the grid rather than settings
Diffstat (limited to 'indra/viewer_components/updater/llupdatechecker.h')
-rwxr-xr-xindra/viewer_components/updater/llupdatechecker.h12
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,