diff options
| author | callum <none@none> | 2011-10-11 11:29:44 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-11 11:29:44 -0700 |
| commit | 28b97b2478aadc44b41cc99c220e94206def4347 (patch) | |
| tree | 8f52bb332991ba3b8dd911c78a0ecfe468e27adb /indra/llui/lltoolbar.h | |
| parent | aec61c579a40687e2696d38a535143d59f771416 (diff) | |
| parent | 13a2431cb3ca24be1de51c041a046df6fe641b9e (diff) | |
EXP-1255 Merge with PE code from https://hg.lindenlab.com/paulgproductengine/exp-1255/
Changeset: 20863:0d094469fd91
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 321064a0fd..d9ea0f57d3 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -48,7 +48,7 @@ public: struct Params : public LLInitParam::Block<Params, LLButton::Params> { Optional<LLUI::RangeS32::Params> button_width; - Optional<S32> desired_height; + Optional<S32> desired_height; Params() : button_width("button_width"), @@ -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&); |