diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml index d5c0fd2e3..ef8a97c96 100644 --- a/indra/newview/app_settings/settings_ascent.xml +++ b/indra/newview/app_settings/settings_ascent.xml @@ -675,5 +675,27 @@ Value 0 + SingularitySplashPagePrefix + + Comment + Overlay page to display on the login splash string. Leave empty if you want unmodified grid splash page + Persist + 1 + Type + String + Value + http://singularityview.sourceforge.net + + SingularitySplashPagePath + + Comment + Path to the overlay page to display on the login splash string. Leave empty if you want unmodified grid splash page + Persist + 1 + Type + String + Value + splash/ + diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index cbd78eb9e..2cec1dd58 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -840,6 +840,13 @@ void LLPanelLogin::loadLoginPage() gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid()); gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor()); + std::string singularity_splash_uri = gSavedSettings.getString("SingularitySplashPagePrefix"); + if (!singularity_splash_uri.empty()) + { + params["original_page"] = login_uri.asString(); + login_uri = LLURI::buildHTTP(singularity_splash_uri, gSavedSettings.getString("SingularitySplashPagePath"), params); + } + LLMediaCtrl* web_browser = sInstance->getChild("login_html"); if (web_browser->getCurrentNavUrl() != login_uri.asString()) {