summaryrefslogtreecommitdiff
path: root/indra/llui/lltoolbar.h
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-09-26 19:48:17 -0700
committerRichard Nelson <richard@lindenlab.com>2011-09-26 19:48:17 -0700
commitf56bf69dfed63d8b7d5d8994c0c3cafced803a0f (patch)
tree0fd26f3246c40491d079a05b13c4a99f0b790c3f /indra/llui/lltoolbar.h
parent67c9f1daa7a631ba09ef94387665d226e3193a6a (diff)
initial support for switching between icons only and icons + text
Diffstat (limited to 'indra/llui/lltoolbar.h')
-rw-r--r--indra/llui/lltoolbar.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index 657e928319..75ae499a3d 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -32,9 +32,7 @@
#include "llcommandmanager.h"
#include "lllayoutstack.h"
#include "lluictrl.h"
-
-
-class LLCommand;
+#include "llcommandmanager.h"
class LLToolBarButton : public LLButton
@@ -110,7 +108,7 @@ public:
pad_bottom,
pad_between;
// get rid of this
- Multiple<LLToolBarButton::Params> buttons;
+ Multiple<LLCommandId::Params> commands;
Optional<LLPanel::Params> button_panel;
@@ -136,6 +134,7 @@ protected:
private:
void createContextMenu();
void updateLayoutAsNeeded();
+ void createButtons();
void resizeButtonsInRow(std::vector<LLToolBarButton*>& buttons_in_row, S32 max_row_girth);
BOOL isSettingChecked(const LLSD& userdata);
void onSettingEnable(const LLSD& userdata);