diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:29:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:29:30 -0500 |
| commit | 20921d6a1a2e98fee750cb5a76adddb7266183f3 (patch) | |
| tree | 8966865c6484af39f1d2af276f961f0999e49a3f /indra/llui/llurlentry.cpp | |
| parent | b5df1d2abcef04ee5f491a7414189f4e82faaa1e (diff) | |
| parent | fc22e2cf5bfc97caaf1ad69814b7dd217cbafef0 (diff) | |
merge performance data tracking system STORM-104
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 |