summaryrefslogtreecommitdiff
path: root/indra/llui/llurlmatch.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-05-24 18:29:29 -0700
committerRichard Nelson <none@none>2010-05-24 18:29:29 -0700
commitf682c996d28c3841b6709f8fc67ba443bfcd1926 (patch)
tree2be85feed4fe3cd32204f19504626420ad9dd556 /indra/llui/llurlmatch.cpp
parent4ea7d2de9fcab4dd4694fcbbd2fece1c57f41d2c (diff)
DEV-50271 FIX SLURL support for non-clickable display names
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
-rw-r--r--indra/llui/llurlmatch.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp
index 8a7e2e162b..51fca6d7c0 100644
--- a/indra/llui/llurlmatch.cpp
+++ b/indra/llui/llurlmatch.cpp
@@ -42,16 +42,14 @@ LLUrlMatch::LLUrlMatch() :
mTooltip(""),
mIcon(""),
mMenuName(""),
- mLocation(""),
- mDisabledLink(false)
+ mLocation("")
{
}
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,
- bool disabled_link)
+ const std::string &menu, const std::string &location)
{
mStart = start;
mEnd = end;
@@ -60,7 +58,7 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url,
mTooltip = tooltip;
mIcon = icon;
mStyle = style;
+ mStyle.link_href = url;
mMenuName = menu;
mLocation = location;
- mDisabledLink = disabled_link;
}