diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-10-09 10:41:30 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-10-09 10:41:30 -0400 |
| commit | ed9685e41b1b91f63de1964661dacb0718f73186 (patch) | |
| tree | 8a9c24df9f735b9a461bca0443b60f767a1e9ac7 /indra/llui/llurlregistry.cpp | |
| parent | 1c6b7e19792e02d0b6605ce5c1cae238405de463 (diff) | |
| parent | d7db567f27e6cc30aaffaf38d6ea219a7adf4678 (diff) | |
merge
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
| -rwxr-xr-x | indra/llui/llurlregistry.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 462b3d6979..9e8d8d01f1 100755 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -27,6 +27,7 @@ #include "linden_common.h" #include "llurlregistry.h" +#include "lluriparser.h" #include <boost/regex.hpp> @@ -207,6 +208,11 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL { // fill in the LLUrlMatch object and return it std::string url = text.substr(match_start, match_end - match_start + 1); + + LLUriParser up(url); + up.normalize(); + url = up.normalizedUri(); + match.setValues(match_start, match_end, match_entry->getUrl(url), match_entry->getLabel(url, cb), |