summaryrefslogtreecommitdiff
path: root/indra/newview/llurldispatcher.cpp
diff options
context:
space:
mode:
authorAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2023-10-12 17:02:47 +0200
committerAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2023-10-12 18:32:43 +0200
commit70988ede9e924960c37cd01797c9a435b557acec (patch)
treeb9e274daf1af27591984c8980073fb7fb5f106d0 /indra/newview/llurldispatcher.cpp
parentb134e91d2a2e7ff97e6f906d6ef36177e1dddeab (diff)
SL-20422 Clicking the 'Bring it back' link on Aditi displays a teleport alert
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
-rw-r--r--indra/newview/llurldispatcher.cpp5
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);
}