Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass-through login splash page that allows update notifications.

Browse Source 
Page source: https://github.com/singularity-viewer/login-page
This commit is contained in:
Latif Khalifa
2013-07-22 16:31:20 +02:00
parent fe49fe1928
commit b70c306e5f
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/app_settings/settings_ascent.xml
View File

@@ -675,5 +675,27 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>SingularitySplashPagePrefix</key>
<map>
<key>Comment</key>
<string>Overlay page to display on the login splash string. Leave empty if you want unmodified grid splash page</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://singularityview.sourceforge.net</string>
</map>
<key>SingularitySplashPagePath</key>
<map>
<key>Comment</key>
<string>Path to the overlay page to display on the login splash string. Leave empty if you want unmodified grid splash page</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>splash/</string>
</map>
</map>
</llsd>

7
indra/newview/llpanellogin.cpp
View File

@@ -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<LLMediaCtrl>("login_html");
if (web_browser->getCurrentNavUrl() != login_uri.asString())
{