summaryrefslogtreecommitdiff
path: root/indra/llui/llurlmatch.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-05-26 13:14:47 -0700
committerRichard Nelson <none@none>2010-05-26 13:14:47 -0700
commit7435ff08b5f548d6e5c61129179c70d99177cc45 (patch)
tree2f6cf43a53080567f723730041a006024974665a /indra/llui/llurlmatch.cpp
parent0ebdba45f6fbcecfe0aa63bb37ddcde2efba6d87 (diff)
DEV-50271 FIX SLURL support for non-clickable display names
separate mIsLink from mLink to support non-clickable urls (e.g. secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/completename)
Diffstat (limited to 'indra/llui/llurlmatch.cpp')
-rw-r--r--indra/llui/llurlmatch.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp
index dcfdd70b42..51fca6d7c0 100644
--- a/indra/llui/llurlmatch.cpp
+++ b/indra/llui/llurlmatch.cpp
@@ -42,16 +42,14 @@ LLUrlMatch::LLUrlMatch() :
mTooltip(""),
mIcon(""),
mMenuName(""),
- mLocation(""),
- mDisabledLink(false)
+ mLocation("")
{
}
void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url,
const std::string &label, const std::string &tooltip,
const std::string &icon, const LLStyle::Params& style,
- const std::string &menu, const std::string &location,
- bool disabled_link)
+ const std::string &menu, const std::string &location)
{
mStart = start;
mEnd = end;
@@ -63,5 +61,4 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url,
mStyle.link_href = url;
mMenuName = menu;
mLocation = location;
- mDisabledLink = disabled_link;
}