summaryrefslogtreecommitdiff
path: root/indra/llui/llurlmatch.cpp
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-06-09 15:47:37 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-06-09 15:47:37 -0700
commitf2f7f7b3bb2c8466e2a07f8f586a1a63fdae8a66 (patch)
tree9c74f8e5ca2601bbdf87a4b5e034b76784bdacea /indra/llui/llurlmatch.cpp
parent163b767944caa4b2a474abf93e64eaeac1f02587 (diff)
parent4bbca7c086724da1af4f8cb6b22e6de8320a0b1b (diff)
merge
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
-rw-r--r--indra/llui/llurlmatch.cpp3
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;
}