diff options
| author | Richard Linden <none@none> | 2010-05-25 18:52:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-05-25 18:52:24 -0700 |
| commit | d539145367d74c0881bcf47daefaca4820f04c72 (patch) | |
| tree | 312044bd5858c61de403fcf3cde977cf300a1b06 /indra/llui/llurlregistry.cpp | |
| parent | d8f2e1d820e717f267375773407110bec1e9dae2 (diff) | |
DEV-50271 FIX SLURL support for non-clickable display names
revived mDisabledLink to make url replacement logic work again
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
| -rw-r--r-- | indra/llui/llurlregistry.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index f119233f8f..f61603545f 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -192,7 +192,8 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL match_entry->getIcon(url), match_entry->getStyle(), match_entry->getMenuName(), - match_entry->getLocation(url)); + match_entry->getLocation(url), + match_entry->isLinkDisabled()); return true; } @@ -225,7 +226,8 @@ bool LLUrlRegistry::findUrl(const LLWString &text, LLUrlMatch &match, const LLUr match.getIcon(), match.getStyle(), match.getMenuName(), - match.getLocation()); + match.getLocation(), + match.isLinkDisabled()); return true; } return false; |
