diff options
| author | Richard Linden <none@none> | 2010-06-03 14:37:02 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-03 14:37:02 -0700 |
| commit | fbf72790169e979908ec206e6cb705dcc41ad97f (patch) | |
| tree | d9bbee69e806a5c89316a7c1fee484bd6c67f171 /indra/llui/llurlmatch.cpp | |
| parent | f79ac664dd6eead75368ced40110b6f0474aa92e (diff) | |
merge fixes
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
| -rw-r--r-- | indra/llui/llurlmatch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |