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

Add the naked URL to the "external website" nag

master
Beq 2025-02-19 21:43:24 +00:00
parent 66b016d629
commit cfa3e4b07c
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermenu.cpp
View File

@ -8636,7 +8636,9 @@ class LLPromptShowURL : public view_listener_t
{
LLSD payload;
payload["url"] = url;
LLNotificationsUtil::add(alert, LLSD(), payload, callback_show_url);
LLSD args;
args["UNTRUSTED_URL"] = url;
LLNotificationsUtil::add(alert, args, payload, callback_show_url);
}
// </FS:Ansariel>
}

4
indra/newview/llweb.cpp
View File

@ -103,7 +103,9 @@ void LLWeb::loadURLExternal(const std::string& url, bool async, const std::strin
LLSD payload;
payload["url"] = url;
LLNotificationsUtil::add( "WebLaunchExternalTarget", LLSD(), payload, boost::bind(on_load_url_external_response, _1, _2, async));
LLSD args;
args["UNTRUSTED_URL"] = url;
LLNotificationsUtil::add( "WebLaunchExternalTarget", args, payload, boost::bind(on_load_url_external_response, _1, _2, async));
}
// static

1
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -4543,6 +4543,7 @@ Deeding this object will cause the group to:
type="alertmodal">
Do you want to open your Web browser to view this content?
Opening webpages from an unknown source may place your computer at risk.
URL : [UNTRUSTED_URL]
<tag>confirm</tag>
<usetemplate
ignoretext="Launch my browser to view a web page"