diff options
| author | Cinder Biscuits <cinder@alchemyviewer.org> | 2015-02-26 14:55:50 -0700 |
|---|---|---|
| committer | Cinder Biscuits <cinder@alchemyviewer.org> | 2015-02-26 14:55:50 -0700 |
| commit | d9673d6c1d67ac104fc7872ea2da88560832dd28 (patch) | |
| tree | b2ab207152ee7b025eab69eed03733819bdf3d05 /indra/llui/llurlmatch.cpp | |
| parent | 4665d35453f00fcccd6e17ea84d0549f62b07c5f (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
| -rwxr-xr-x | indra/llui/llurlmatch.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp index c1f1382a9f..016d1ca92d 100755 --- a/indra/llui/llurlmatch.cpp +++ b/indra/llui/llurlmatch.cpp @@ -37,7 +37,8 @@ LLUrlMatch::LLUrlMatch() : mIcon(""), mMenuName(""), mLocation(""), - mUnderlineOnHoverOnly(false) + mUnderlineOnHoverOnly(false), + mTrusted(false) { } @@ -45,7 +46,7 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, const std::string &label, 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) + const LLUUID& id, bool underline_on_hover_only, bool trusted) { mStart = start; mEnd = end; @@ -59,4 +60,5 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, mLocation = location; mID = id; mUnderlineOnHoverOnly = underline_on_hover_only; + mTrusted = trusted; } |
