summaryrefslogtreecommitdiff
path: root/indra/llui/llurlregistry.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-04-10 10:30:37 +0300
committerGitHub <noreply@github.com>2024-04-10 10:30:37 +0300
commit5af93ff0d53606db3dca727a8cd1b73d7c37d70b (patch)
tree2deaa98bcd99fd2860da758a92816c3bdb838acd /indra/llui/llurlregistry.cpp
parenta902138de15067a86a6aeb02fdabd094873da0b2 (diff)
parent0acee937f55e6d1a198be2549d5cb55a0403dd4d (diff)
Merge pull request #1177 from secondlife/marchcat/c-merge
Release (Maint W) -> Maint C merge
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
-rw-r--r--indra/llui/llurlregistry.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 3bd7321777..f1df7699e2 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -221,8 +221,10 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
if (match_entry == mUrlEntryTrusted)
{
LLUriParser up(url);
- up.normalize();
- url = up.normalizedUri();
+ if (up.normalize() == 0)
+ {
+ url = up.normalizedUri();
+ }
}
match.setValues(match_start, match_end,