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/llurlmatch.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/llurlmatch.cpp')
-rw-r--r-- | indra/llui/llurlmatch.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp index 51fca6d7c0..dcfdd70b42 100644 --- a/indra/llui/llurlmatch.cpp +++ b/indra/llui/llurlmatch.cpp @@ -42,14 +42,16 @@ LLUrlMatch::LLUrlMatch() : mTooltip(""), mIcon(""), mMenuName(""), - mLocation("") + mLocation(""), + mDisabledLink(false) { } void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, const std::string &label, const std::string &tooltip, const std::string &icon, const LLStyle::Params& style, - const std::string &menu, const std::string &location) + const std::string &menu, const std::string &location, + bool disabled_link) { mStart = start; mEnd = end; @@ -61,4 +63,5 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, mStyle.link_href = url; mMenuName = menu; mLocation = location; + mDisabledLink = disabled_link; } |