Merge tag 'Second_Life_Release#d9e55c44-Second_Life_Release#d9e55c4-2025.04' into 2025.04

1 files changed, 7 insertions, 4 deletions

diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h
index 887796bb37..418a21f963 100644
--- a/indra/llui/llurlmatch.h
+++ b/indra/llui/llurlmatch.h
@@ -79,18 +79,20 @@ public:
     /// return the SL location that this Url describes, or "" if none.
     std::string getLocation() const { return mLocation; }
 
-    /// Should this link text be underlined only when mouse is hovered over it?
-    bool underlineOnHoverOnly() const { return mUnderlineOnHoverOnly; }
+    typedef LLStyle::EUnderlineLink e_underline;
+    e_underline getUnderline() const { return mUnderline; }
 
     /// Return true if Url is trusted.
     bool isTrusted() const { return mTrusted; }
 
+    bool getSkipProfileIcon() const { return mSkipProfileIcon; }
+
     /// 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& query, const std::string &tooltip, const std::string &icon,
                    const LLStyle::Params& style, const std::string &menu,
                    const std::string &location, const LLUUID& id,
-                   bool underline_on_hover_only = false, bool trusted = false);
+                   e_underline underline = e_underline::UNDERLINE_ALWAYS, bool trusted = false, bool skip_icon = false);
 
     const LLUUID& getID() const { return mID; }
 private:
@@ -105,8 +107,9 @@ private:
     std::string mLocation;
     LLUUID      mID;
     LLStyle::Params mStyle;
-    bool        mUnderlineOnHoverOnly;
+    e_underline mUnderline;
     bool        mTrusted;
+    bool mSkipProfileIcon;
 };
 
 #endif