diff options
| author | simon <none@none> | 2014-01-10 13:15:19 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-10 13:15:19 -0800 |
| commit | cfadbe631fbf845db8e26793613dea37ef08d11c (patch) | |
| tree | 1283cd746e6a1b0d0ffc214e8cc6863f1202c226 /indra/llui/llurlentry.cpp | |
| parent | f291995dac53c2aba9d79aef8b6cd91a5c836e9f (diff) | |
Revert earlier back-out for MAINT-535 ... it's back in
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rwxr-xr-x | indra/llui/llurlentry.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 2d28ac41b2..840f67968d 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -1067,10 +1067,8 @@ LLUrlEntrySLLabel::LLUrlEntrySLLabel() std::string LLUrlEntrySLLabel::getLabel(const std::string &url, const LLUrlLabelCallback &cb) { - // MAINT-535 reversion test - // std::string label = getLabelFromWikiLink(url); - // return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url); - return getLabelFromWikiLink(url); + std::string label = getLabelFromWikiLink(url); + return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url); } std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const |