diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-03 11:18:17 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-03 11:18:17 +0100 |
| commit | 3fe3e119d824158a12e372039e2002e138c2505b (patch) | |
| tree | bccc4886a25ac789de51f0ea014591c4024c9ea1 /indra/llui/llurlmatch.cpp | |
| parent | 37a63be504f26f93cedb3771c24f74f4c8a48adf (diff) | |
| parent | 5c263cdc64507cfa1f0f88712b45332894aab09e (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
| -rw-r--r-- | indra/llui/llurlmatch.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp index 72a199c220..7c96665ce4 100644 --- a/indra/llui/llurlmatch.cpp +++ b/indra/llui/llurlmatch.cpp @@ -51,7 +51,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 LLUIColor& color, const std::string &menu, const std::string &location, - bool disabled_link) + bool disabled_link, const LLUUID& id) { mStart = start; mEnd = end; @@ -63,4 +63,5 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, mMenuName = menu; mLocation = location; mDisabledLink = disabled_link; + mID = id; } |