diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
commit | 5c73a908353cdd7210e3148f7162d30afab7873a (patch) | |
tree | 3ff858042b69b20a9eb3062b7cabd0c390e1b5cf /indra/llui/llurlmatch.cpp | |
parent | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (diff) | |
parent | 5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff) |
automated merge
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
-rw-r--r-- | indra/llui/llurlmatch.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp index 3b47145a22..72a199c220 100644 --- a/indra/llui/llurlmatch.cpp +++ b/indra/llui/llurlmatch.cpp @@ -41,14 +41,17 @@ LLUrlMatch::LLUrlMatch() : mLabel(""), mTooltip(""), mIcon(""), - mMenuName("") + mMenuName(""), + mLocation(""), + mDisabledLink(false) { } 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 &menu, const std::string &location) + const std::string &menu, const std::string &location, + bool disabled_link) { mStart = start; mEnd = end; @@ -59,4 +62,5 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, mColor = color; mMenuName = menu; mLocation = location; + mDisabledLink = disabled_link; } |