diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-08 10:48:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-08 10:48:26 -0500 |
| commit | 3763386987bd7ab42438a1f1bdf3a78283bcbf51 (patch) | |
| tree | b45814d100958d0adb07100440888c56200a5a9a /indra/llui/lltabcontainer.cpp | |
| parent | 66555b844dfcdb1bbbab472967a90060c5d0838f (diff) | |
| parent | 757a955bd700eb4f838762dcbe789a77ee052064 (diff) | |
merge changes for vmrg-213
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index d5f8707381..5fc2cc350d 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -98,24 +98,25 @@ class LLCustomButtonIconCtrl : public LLButton { public: struct Params - : public LLInitParam::Block<Params, LLButton::Params> + : public LLInitParam::Block<Params, LLButton::Params> { // LEFT, RIGHT, TOP, BOTTOM paddings of LLIconCtrl in this class has same value Optional<S32> icon_ctrl_pad; - Params(): - icon_ctrl_pad("icon_ctrl_pad", 1) + Params() + : icon_ctrl_pad("icon_ctrl_pad", 1) {} }; protected: friend class LLUICtrlFactory; - LLCustomButtonIconCtrl(const Params& p): - LLButton(p), + + LLCustomButtonIconCtrl(const Params& p) + : LLButton(p), mIcon(NULL), mIconAlignment(LLFontGL::HCENTER), mIconCtrlPad(p.icon_ctrl_pad) - {} + {} public: |