summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.cpp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2024-01-19 11:36:56 -0600
committerGitHub <noreply@github.com>2024-01-19 11:36:56 -0600
commit6dd260c3699148b4ddf8e7bff84f4b19f8bbf076 (patch)
tree6c9144f701ecb2cda859baaeed4e2f4ee6f9a683 /indra/newview/llviewerfloaterreg.cpp
parent45547c7bbadf15804f54bb28fd1c94eb5f080bf5 (diff)
parent09ee84f675cf08f98cbd49516c5e01c289b42a20 (diff)
Merge branch 'release/materials_featurette' into DRTVWR-592
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
-rw-r--r--indra/newview/llviewerfloaterreg.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 6da0e9d695..3a08f748d6 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -193,7 +193,11 @@ public:
std::string fl_name = params[0].asString();
- if (nav_type == NAV_TYPE_CLICKED)
+ // External browsers explicitly ask user about opening links
+ // so treat "external" same as "clicked" in this case,
+ // despite it being treated as untrusted.
+ if (nav_type == NAV_TYPE_CLICKED
+ || nav_type == NAV_TYPE_EXTERNAL)
{
const std::list<std::string> blacklist_clicked = {
"camera_presets",