diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-12-15 17:52:42 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-12-15 17:52:42 +0200 |
| commit | efeab1d5b5146000b535bb68ad14e82ab8867c1b (patch) | |
| tree | d9d9f5ac05e815e542721c861048d95a5a183cc6 | |
| parent | 062be76dd515d3c6630c0a2c8ff953ef22ff3a0d (diff) | |
MAINT-8098 FIXED The Viewer uses http: for the splash page even when configured for https:
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 0bcbdf7e67..c76985f42e 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -801,7 +801,8 @@ void LLPanelLogin::loadLoginPage() params["login_content_version"] = gSavedSettings.getString("LoginContentVersion"); // Make an LLURI with this augmented info - LLURI login_uri(LLURI::buildHTTP(login_page.authority(), + std::string url = login_page.scheme().empty()? login_page.authority() : login_page.scheme() + "://" + login_page.authority(); + LLURI login_uri(LLURI::buildHTTP(url, login_page.path(), params)); |