diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
commit | d5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch) | |
tree | de0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/llui/llflyoutbutton.cpp | |
parent | c4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff) | |
parent | 71dc13aac99458989776e93c38294f507074fce4 (diff) |
Almost automated merge
Diffstat (limited to 'indra/llui/llflyoutbutton.cpp')
-rw-r--r-- | indra/llui/llflyoutbutton.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp index 3483bac782..abb0b869eb 100644 --- a/indra/llui/llflyoutbutton.cpp +++ b/indra/llui/llflyoutbutton.cpp @@ -48,6 +48,7 @@ LLFlyoutButton::LLFlyoutButton(const Params& p) // Text label button LLButton::Params bp(p.action_button); bp.name(p.label); + bp.label(p.label); bp.rect.left(0).bottom(0).width(getRect().getWidth() - FLYOUT_BUTTON_ARROW_WIDTH).height(getRect().getHeight()); bp.click_callback.function(boost::bind(&LLFlyoutButton::onActionButtonClick, this, _2)); bp.follows.flags(FOLLOWS_ALL); |