summaryrefslogtreecommitdiff
path: root/indra/llui/llurlmatch.cpp
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-01 16:32:16 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-01 16:32:16 +0200
commitbf6d1713ec71ca88daf0f19c6d444b82ba2ccad2 (patch)
treeeaf444acb6a27e76ac0bb1723f0f9853e8980f7b /indra/llui/llurlmatch.cpp
parent3650ef0d9ff937aeb1081817158021adb3f081d2 (diff)
parent379762d2c1dd4e0804dd6ab1b930f525e1a60189 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
-rw-r--r--indra/llui/llurlmatch.cpp8
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;
}