summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.cpp
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2023-12-14 12:07:18 -0800
committerBrad Linden <brad@lindenlab.com>2023-12-14 12:07:18 -0800
commit4c791e098d3abafa406e0e269038c40aae67f66c (patch)
treed566be04939faf3dc29655a8113afc067b2b7c99 /indra/newview/llviewerfloaterreg.cpp
parentc74dbc6e5b117bcd020c0efecf5255ad731f310f (diff)
parenta592292242e29d0379ee72572a434359e1e892d1 (diff)
Merge remote-tracking branch 'origin/main' into DRTVWR-596
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",