diff options
| author | simon <none@none> | 2014-01-09 10:56:44 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-09 10:56:44 -0800 |
| commit | ade7faae5802c1e68bb2b09ba9e126bbfa2cfb37 (patch) | |
| tree | 75176cac336eb01344aa8b75e8763178c23e4e22 /indra/llui/llurlentry.cpp | |
| parent | e89bda2586a8f6054b3822900aaaedf5c6934b75 (diff) | |
| parent | 6b4a35723006b7dec25b7f0677b0dae8ce88008c (diff) | |
Merge downstream -bear
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rwxr-xr-x | indra/llui/llurlentry.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 840f67968d..2d28ac41b2 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -1067,8 +1067,10 @@ LLUrlEntrySLLabel::LLUrlEntrySLLabel() std::string LLUrlEntrySLLabel::getLabel(const std::string &url, const LLUrlLabelCallback &cb) { - std::string label = getLabelFromWikiLink(url); - return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url); + // MAINT-535 reversion test + // std::string label = getLabelFromWikiLink(url); + // return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url); + return getLabelFromWikiLink(url); } std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const |