diff options
author | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
commit | a8ef2525711f1f9312c1c9ebb8f137f4d25e659a (patch) | |
tree | b1486d5ab0b0eddc26a7dc0f369b12f612179869 /indra/llui/llurlmatch.cpp | |
parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) |
merge changes for 3.7.27-release
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
-rwxr-xr-x | indra/llui/llurlmatch.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp index 016d1ca92d..2f2ac969e1 100755 --- a/indra/llui/llurlmatch.cpp +++ b/indra/llui/llurlmatch.cpp @@ -42,8 +42,8 @@ LLUrlMatch::LLUrlMatch() : { } -void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, - const std::string &label, const std::string &tooltip, +void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, const std::string &label, + const std::string& query, const std::string &tooltip, const std::string &icon, const LLStyle::Params& style, const std::string &menu, const std::string &location, const LLUUID& id, bool underline_on_hover_only, bool trusted) @@ -52,6 +52,7 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, mEnd = end; mUrl = url; mLabel = label; + mQuery = query; mTooltip = tooltip; mIcon = icon; mStyle = style; |