diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-03 15:59:44 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-03 15:59:44 +0100 |
commit | e697ca28acb91a422a7d46249f28a1b284217a61 (patch) | |
tree | 8f3e590d98b811707c8721825a1765eaf0a662ab /indra/llui/llurlmatch.cpp | |
parent | 2f526db82608915a6ed9d04f31fb004acf239f4f (diff) | |
parent | 797c1dbc6ef1c51755dcace98caf0c493cd8f511 (diff) |
merge from viewer-public
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; } |