diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-02-25 19:24:23 +0100 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-02-25 19:24:23 +0100 |
| commit | 071778d75e0120495cc2a10affc7334c12380dd0 (patch) | |
| tree | a800b362a8990fe4250a3a436f307d08aa8e326b /indra/llui/llurlmatch.cpp | |
| parent | aef5979bfb249db753fa31dac509437b7f7536aa (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
Merge
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; } |
