Manual merge from default branch

--HG--
branch : product-engine

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h
index 7a4f0bc10e..d1b2112ee7 100644
--- a/indra/llui/llurlmatch.h
+++ b/indra/llui/llurlmatch.h
@@ -80,12 +80,15 @@ public:
 	/// is this a match for a URL that should not be hyperlinked?
 	bool isLinkDisabled() const { return mDisabledLink; }
 
+	/// Should this link text be underlined only when mouse is hovered over it?
+	bool underlineOnHoverOnly() const { return mUnderlineOnHoverOnly; }
+
 	/// Change the contents of this match object (used by LLUrlRegistry)
 	void 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, bool disabled_link
-				   , const LLUUID& id );
+				   , const LLUUID& id, bool underline_on_hover_only  = false );
 
 	const LLUUID& getID() const { return mID;}
 
@@ -102,6 +105,7 @@ private:
 	LLUUID		mID;
 	LLUIColor	mColor;
 	bool        mDisabledLink;
+	bool		mUnderlineOnHoverOnly;
 };
 
 #endif