Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16114 from huffman/feat/win-launcher-thunder-override

Browse source 
DEV-457: Add HIFI_THUNDER_URL to win32 launcher
This commit is contained in:
Shannon Romano 2019-08-29 10:53:35 -07:00 committed by GitHub
commit b7873a6194
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
launchers/win32/LauncherManager.cpp
View file

@ -510,9 +510,17 @@ void LauncherManager::getMostRecentBuilds(CString& launcherUrlOut, CString& laun
if (domainName.GetEnvironmentVariable(L"HQ_LAUNCHER_BUILDS_DOMAIN")) { if (domainName.GetEnvironmentVariable(L"HQ_LAUNCHER_BUILDS_DOMAIN")) {
addToLog(_T("Using overridden builds domain: ") + domainName); addToLog(_T("Using overridden builds domain: ") + domainName);
useHTTPS = false; useHTTPS = false;
} else {
// We have 2 ways to adjust the domain, one of which forces http (HQ_LAUNCHER_BUILDS_DOMAIN),
// the other (HIFI_THUNDER_URL) of which uses https. They represent different use-cases, but
// would ideally be combined by including the protocol in the url, but because
// code is going to be replaced soon, we will leave it like this for now.
if (domainName.GetEnvironmentVariable(L"HIFI_THUNDER_URL")) {
addToLog(_T("Using overridden thunder url: ") + domainName);
} else { } else {
domainName = L"thunder.highfidelity.com"; domainName = L"thunder.highfidelity.com";
} }
}
CString pathName; CString pathName;
if (pathName.GetEnvironmentVariable(L"HQ_LAUNCHER_BUILDS_PATH")) { if (pathName.GetEnvironmentVariable(L"HQ_LAUNCHER_BUILDS_PATH")) {