diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-29 14:32:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-29 14:32:37 +0300 |
| commit | 2ee039c736f64c91bb4f16e403360cddb0089707 (patch) | |
| tree | e565fac793bebb6d97fb6f2ec35bc484615a749f /indra/llui | |
| parent | e687250b90e63e71c9115ed97c3efd60ceefbcb6 (diff) | |
| parent | 3e322df4fb71cbeff27aab85bb48c7da595b548c (diff) | |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llurlentry.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llurlregistry.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 198441804b..79d2fcd049 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -239,7 +239,7 @@ std::string LLUrlEntryBase::urlToLabelWithGreyQuery(const std::string &url) cons return url; } LLUriParser up(escapeUrl(url)); - if (up.normalize() == 0) + if (up.normalize()) { std::string label; up.extractParts(); diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 3a4ce6a72f..cec1ddfc57 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -221,7 +221,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL if (match_entry == mUrlEntryTrusted) { LLUriParser up(url); - if (up.normalize() == 0) + if (up.normalize()) { url = up.normalizedUri(); } |