diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
| commit | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch) | |
| tree | 8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/llui/llurlentry.cpp | |
| parent | e3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff) | |
| parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rw-r--r-- | indra/llui/llurlentry.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 84678ef4db..6cc72bad82 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -209,7 +209,13 @@ LLUrlEntryHTTPLabel::LLUrlEntryHTTPLabel() std::string LLUrlEntryHTTPLabel::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 LLUrlEntryHTTPLabel::getTooltip(const std::string &string) const +{ + return getUrl(string); } std::string LLUrlEntryHTTPLabel::getUrl(const std::string &string) const |