summaryrefslogtreecommitdiff
path: root/indra/llui/llurlmatch.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
-rw-r--r--indra/llui/llurlmatch.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp
index 72a199c220..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 LLUIColor& color,
- const std::string &menu, const std::string &location,
- bool disabled_link)
+ const std::string &icon, const LLStyle::Params& style,
+ const std::string &menu, const std::string &location)
{
mStart = start;
mEnd = end;
@@ -59,8 +57,8 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url,
mLabel = label;
mTooltip = tooltip;
mIcon = icon;
- mColor = color;
+ mStyle = style;
+ mStyle.link_href = url;
mMenuName = menu;
mLocation = location;
- mDisabledLink = disabled_link;
}