diff options
author | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
commit | 82ae214f6a367e17dd335e80e2444cf672108821 (patch) | |
tree | 5a2ebb115b0674698cfb0d9cbd879add63d88ece /indra/llui/llurlmatch.cpp | |
parent | fe8dec32dbdd6085dd582c49134551638561ca0e (diff) | |
parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) |
Merged lindenlab/viewer-tools-update into default
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; |