diff options
author | David Seikel | 2011-04-21 06:15:47 +1000 |
---|---|---|
committer | David Seikel | 2011-04-21 06:15:47 +1000 |
commit | 2578baba1f5149ec83878e6e88f8066fc7b86d32 (patch) | |
tree | a7346d7bf4d54b4d7ad198fca17795dc9162b28e /linden/indra/llui | |
parent | Move tho OTR preferences to their own floater, with a button in the IM tab. (diff) | |
download | meta-impy-2578baba1f5149ec83878e6e88f8066fc7b86d32.zip meta-impy-2578baba1f5149ec83878e6e88f8066fc7b86d32.tar.gz meta-impy-2578baba1f5149ec83878e6e88f8066fc7b86d32.tar.bz2 meta-impy-2578baba1f5149ec83878e6e88f8066fc7b86d32.tar.xz |
Allow changing the text on a flyout button.
Needed for the new OTR UI, and complements the same ability on combo boxes (flyout buttons inherit from combo boxes).
Diffstat (limited to 'linden/indra/llui')
-rw-r--r-- | linden/indra/llui/llcombobox.cpp | 5 | ||||
-rw-r--r-- | linden/indra/llui/llcombobox.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp index a93dc9b..fd3bb80 100644 --- a/linden/indra/llui/llcombobox.cpp +++ b/linden/indra/llui/llcombobox.cpp | |||
@@ -1331,3 +1331,8 @@ void LLFlyoutButton::setToggleState(BOOL state) | |||
1331 | mToggleState = state; | 1331 | mToggleState = state; |
1332 | } | 1332 | } |
1333 | 1333 | ||
1334 | void LLFlyoutButton::setLabel(const LLStringExplicit& name) | ||
1335 | { | ||
1336 | mActionButton->setLabel(name); | ||
1337 | } | ||
1338 | |||
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h index 596f659..18e4379 100644 --- a/linden/indra/llui/llcombobox.h +++ b/linden/indra/llui/llcombobox.h | |||
@@ -224,6 +224,8 @@ public: | |||
224 | static void onActionButtonClick(void *userdata); | 224 | static void onActionButtonClick(void *userdata); |
225 | static void onSelectAction(LLUICtrl* ctrl, void *userdata); | 225 | static void onSelectAction(LLUICtrl* ctrl, void *userdata); |
226 | 226 | ||
227 | void setLabel(const LLStringExplicit& name); | ||
228 | |||
227 | protected: | 229 | protected: |
228 | LLButton* mActionButton; | 230 | LLButton* mActionButton; |
229 | LLPointer<LLUIImage> mActionButtonImage; | 231 | LLPointer<LLUIImage> mActionButtonImage; |