livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #130 from Hecklezz/feature/new_loginpage_param 

Adds new login page param
master
Pantera Północy 2025-05-19 08:51:46 +02:00 committed by GitHub
parent a7ba94d507 192c8018f3
commit 0a3c934cc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/app_settings/settings.xml
View File

@ -25015,6 +25015,19 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSNoVersionPopup</key>
<map>
<key>Comment</key>
<string>Disables version popup on the Firestorm Login page</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>HideFromEditor</key>
<integer>1</integer>
</map>
<key>FSllOwnerSayToScriptDebugWindowRouting</key>
<map>
<key>Comment</key>

6
indra/newview/fspanellogin.cpp
View File

@ -923,6 +923,12 @@ void FSPanelLogin::loadLoginPage()
// login page (web) content version
params["login_content_version"] = gSavedSettings.getString("LoginContentVersion");
// No version popup
if (gSavedSettings.getBOOL("FSNoVersionPopup"))
{
params["noversionpopup"] = "true";
}
// Make an LLURI with this augmented info
std::string url = login_page.scheme().empty()? login_page.authority() : login_page.scheme() + "://" + login_page.authority();
LLURI login_uri(LLURI::buildHTTP(url,