diff options
| author | simon <simon@lindenlab.com> | 2024-01-03 01:34:58 +0000 |
|---|---|---|
| committer | simon <simon@lindenlab.com> | 2024-01-03 01:34:58 +0000 |
| commit | 520f710cd6b5826403383f8c3488a94c64ac8081 (patch) | |
| tree | 3936a248d991e11b82768ff10a5079789299bb53 /indra/newview/llviewerfloaterreg.cpp | |
| parent | d4c3300f9b81296f765c83c1e822251e86d91925 (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge remote-tracking branch 'origin/main' into simon/sl-20635-new-data
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 6 |
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", |