diff options
author | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
commit | dbe965eaa1864ff71e365608488a5015172a24ed (patch) | |
tree | f3a7f10360a50a09ca1267fd204802507b079a17 /indra/llui/llurlregistry.cpp | |
parent | 6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff) | |
parent | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff) |
Sync with viewer-development
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
-rw-r--r-- | indra/llui/llurlregistry.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 1c103a628b..9d215cf7ef 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -178,7 +178,8 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL match_entry->getMenuName(), match_entry->getLocation(url), match_entry->isLinkDisabled(), - match_entry->getID(url)); + match_entry->getID(url), + match_entry->underlineOnHoverOnly(url)); return true; } @@ -213,7 +214,8 @@ bool LLUrlRegistry::findUrl(const LLWString &text, LLUrlMatch &match, const LLUr match.getMenuName(), match.getLocation(), match.isLinkDisabled(), - match.getID()); + match.getID(), + match.underlineOnHoverOnly()); return true; } return false; |