summaryrefslogtreecommitdiff
path: root/indra/llui/llurlregistry.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/llurlregistry.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/llurlregistry.cpp')
-rw-r--r--indra/llui/llurlregistry.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index f61603545f..f119233f8f 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -192,8 +192,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
match_entry->getIcon(url),
match_entry->getStyle(),
match_entry->getMenuName(),
- match_entry->getLocation(url),
- match_entry->isLinkDisabled());
+ match_entry->getLocation(url));
return true;
}
@@ -226,8 +225,7 @@ bool LLUrlRegistry::findUrl(const LLWString &text, LLUrlMatch &match, const LLUr
match.getIcon(),
match.getStyle(),
match.getMenuName(),
- match.getLocation(),
- match.isLinkDisabled());
+ match.getLocation());
return true;
}
return false;