Manual merge from default branch

--HG--
branch : product-engine

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;