diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
| commit | 682609d254fb973cfa267923b69c5e06b7efd7e1 (patch) | |
| tree | 0063e23841b6e3bb588355ad428608bb1f4fcdf9 /indra/llui/lltoolbar.h | |
| parent | 3596c0f7e139724f31258ffb96157146aeba77b1 (diff) | |
| parent | c1a9ca33b27f4e741eeacf781a09156009167ad3 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/lltoolbar.h')
| -rw-r--r-- | indra/llui/lltoolbar.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index f3457028e7..709399c59f 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -47,7 +47,7 @@ class LLToolBarButton : public LLButton public: struct Params : public LLInitParam::Block<Params, LLButton::Params> { - Optional<LLUI::RangeS32> button_width; + Optional<LLUI::RangeS32::Params> button_width; Optional<S32> desired_height; Params() @@ -163,7 +163,7 @@ public: void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); - + static const int RANK_NONE = -1; bool addCommand(const LLCommandId& commandId, int rank = RANK_NONE); @@ -178,6 +178,8 @@ public: LLToolBarButton* createButton(const LLCommandId& id); + bool hasButtons() { return !mButtons.empty(); } + protected: friend class LLUICtrlFactory; LLToolBar(const Params&); |