Merge pull request #5844 from secondlife/geenz/26.3-to-develop

26.3 to Develop

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
index 73211d5292..f768839749 100644
--- a/indra/llui/lldraghandle.h
+++ b/indra/llui/lldraghandle.h
@@ -43,13 +43,17 @@ public:
     :   public LLInitParam::Block<Params, LLView::Params>
     {
         Optional<std::string> label;
+        Optional<S32> label_vpad;
         Optional<LLUIColor> drag_highlight_color;
         Optional<LLUIColor> drag_shadow_color;
+        Optional<const LLFontGL*> font;
 
         Params()
         :   label("label"),
+            label_vpad("label_vpad", 7),
             drag_highlight_color("drag_highlight_color", LLUIColorTable::instance().getColor("DefaultHighlightLight")),
-            drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark"))
+            drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark")),
+            font("font", LLFontGL::getFontSansSerif())
         {
             changeDefault(mouse_opaque, true);
             changeDefault(follows.flags, FOLLOWS_ALL);
@@ -82,6 +86,8 @@ protected:
 
 protected:
     LLTextBox*      mTitleBox;
+    const LLFontGL* mFont;
+    S32             mLabelVPad;
 
 private:
     LLRect          mButtonsRect;