From fbf72790169e979908ec206e6cb705dcc41ad97f Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 3 Jun 2010 14:37:02 -0700 Subject: merge fixes --- indra/llui/llurlmatch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llui/llurlmatch.cpp') diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp index 73d880522b..55ef07da36 100644 --- a/indra/llui/llurlmatch.cpp +++ b/indra/llui/llurlmatch.cpp @@ -48,9 +48,9 @@ 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) + const LLUUID& id) { mStart = start; mEnd = end; -- cgit v1.2.3