diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-10 22:39:11 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-10 22:39:11 -0800 |
| commit | 0e07758b540374aa421d2938ce5ed13e2b9eefe4 (patch) | |
| tree | 145600f9494489b686e13b53edc7f10d75afa0e3 /indra/llui/llurlentry.cpp | |
| parent | 4bbe823302427a705ea541d968f6058571a13c2f (diff) | |
| parent | 61fbc02deb08c1a69b8c24498fe559359496ac91 (diff) | |
merge with STORM-105 and 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 |