diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-16 15:25:25 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-16 15:25:25 -0400 |
| commit | 78d985c154b0d71064b89891f5b2005e48c300ce (patch) | |
| tree | c43bc6be58ec9b30f0f4dfaa6c027736fb331582 /indra/newview/llurldispatcher.cpp | |
| parent | 6c2a278c3dbd9d0660be5e9f6ec1c756af7cb992 (diff) | |
| parent | a3cbd41543258818589dd0e368c68d2dc62b3398 (diff) | |
Merge branch 'main' into release/luau-scripting
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 76fb138768..07ea8a4ec6 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -134,6 +134,11 @@ bool LLURLDispatcherImpl::dispatch(const LLSLURL& slurl, LLMediaCtrl* web, bool trusted_browser) { + // SL-20422 : Clicking the "Bring it back" link on Aditi displays a teleport alert + // Stop further processing empty urls like [secondlife:/// Bring it back.] + if (slurl.getType() == LLSLURL::EMPTY) + return true; + const bool right_click = false; return dispatchCore(slurl, nav_type, right_click, web, trusted_browser); } |