summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-01-04 17:29:50 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-01-04 17:29:50 +0200
commit071e0ff36b510f66100ca338c8ef923858d8c451 (patch)
tree3ab8fca76fce338d569384aefb685a7995ddb052 /indra/llui
parentfb1238a1ce9c3e81243fca60948154c4c0d259e5 (diff)
SL-14494 FIXED llRequestURL() generated URLs are no longer recognized by the viewer as Second Life hosted URLs
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llurlentry.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 5be15eac13..55b33396f7 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -464,7 +464,9 @@ LLUrlEntrySecondlifeURL::LLUrlEntrySecondlifeURL()
"|"
"(https://([-\\w\\.]*\\.)?(secondlife|lindenlab|tilia-inc)\\.com(:\\d{1,5})?)"
"|"
- "(https://([-\\w\\.]*\\.)?secondlifegrid\\.net(:\\d{1,5})?))"
+ "(https://([-\\w\\.]*\\.)?secondlifegrid\\.net(:\\d{1,5})?)"
+ "|"
+ "(https?://([-\\w\\.]*\\.)?secondlife\\.io(:\\d{1,5})?))"
"\\/\\S*",
boost::regex::perl|boost::regex::icase);