diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-10 14:27:55 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-10 14:27:55 -0800 |
| commit | 61fbc02deb08c1a69b8c24498fe559359496ac91 (patch) | |
| tree | 4c50352704fde294cbbe05c34ff138552ef4147f /indra/llui/llurlentry.cpp | |
| parent | b5df1d2abcef04ee5f491a7414189f4e82faaa1e (diff) | |
| parent | d7bca2b7b151969e45492e2ae244f50960fc4ddf (diff) | |
STORM-105 : merge with 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 |