diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
| commit | d6fdc6e68fc713b21b68e42740d63c3e9005bceb (patch) | |
| tree | 8692c2c7ac5e3b0bbb5fa2b5362f2796dcf71e8b /indra/llui/llurlentry.cpp | |
| parent | bc7a579ba285fa64876a2bc116685f0357fe25dc (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rwxr-xr-x | indra/llui/llurlentry.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index b1cc502c4b..840f67968d 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -1067,7 +1067,8 @@ LLUrlEntrySLLabel::LLUrlEntrySLLabel() std::string LLUrlEntrySLLabel::getLabel(const std::string &url, const LLUrlLabelCallback &cb) { - return getLabelFromWikiLink(url); + std::string label = getLabelFromWikiLink(url); + return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url); } std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const |