diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-09 16:47:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 16:47:01 -0500 |
| commit | 90640ed303184436ccac4d8a8da3588909bf4c3b (patch) | |
| tree | 9d7b8bcff30ed7e74e1b55cc23eb0837e4892bc4 /indra/llui/llurlentry.cpp | |
| parent | 9f6e4d907ec4781f1b82bb71e2028b39860e7df8 (diff) | |
| parent | 4e1c4a203d8ce6ed1cb662c8df1c5e053b7b4f3a (diff) | |
merge fix for STORM-577
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 |