diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-03 14:40:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-03 14:40:10 -0400 |
| commit | a3246a301623f80edb109391c851774cf459fbe8 (patch) | |
| tree | 57dce21a2e37eb9f9770dda9ef01a36c064cf561 /indra/llui/llurlmatch.cpp | |
| parent | 4f95701895a07066d5b46649d720335da1b62e71 (diff) | |
| parent | 797c1dbc6ef1c51755dcace98caf0c493cd8f511 (diff) | |
automated merge
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; } |