diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:30:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:30:08 +0300 |
| commit | 8701e0973450da9c3c1dd905e73011bdeb09c93e (patch) | |
| tree | aecadf995f0174cc41f7cb9846a1382a930d8f82 /indra/newview/llurldispatcher.cpp | |
| parent | 37392be4171303db08a4842b7882b4cb758a8f8d (diff) | |
| parent | 8fa956a16e616191e21bf001eabc4670453debcd (diff) | |
Merge pull request #1178 from secondlife/marchcat/b-merge
Release (Maint W) -> Maint B merge
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); } |