summaryrefslogtreecommitdiff
path: root/indra/llui/llurlmatch.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-05-24 17:25:35 -0700
committerRichard Nelson <none@none>2010-05-24 17:25:35 -0700
commit4ea7d2de9fcab4dd4694fcbbd2fece1c57f41d2c (patch)
tree227164fcefa99483f6f02dfed1edd5133810608e /indra/llui/llurlmatch.cpp
parent2920d4c46f99c8c5bc8942a08a87fa204c57464b (diff)
DEV-50271 FIX SLURL support for non-clickable display names
reviewed by James
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
-rw-r--r--indra/llui/llurlmatch.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp
index 72a199c220..8a7e2e162b 100644
--- a/indra/llui/llurlmatch.cpp
+++ b/indra/llui/llurlmatch.cpp
@@ -49,7 +49,7 @@ LLUrlMatch::LLUrlMatch() :
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 &icon, const LLStyle::Params& style,
const std::string &menu, const std::string &location,
bool disabled_link)
{
@@ -59,7 +59,7 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url,
mLabel = label;
mTooltip = tooltip;
mIcon = icon;
- mColor = color;
+ mStyle = style;
mMenuName = menu;
mLocation = location;
mDisabledLink = disabled_link;