From 2578baba1f5149ec83878e6e88f8066fc7b86d32 Mon Sep 17 00:00:00 2001 From: David Seikel Date: Thu, 21 Apr 2011 06:15:47 +1000 Subject: 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). --- linden/indra/llui/llcombobox.cpp | 5 +++++ linden/indra/llui/llcombobox.h | 2 ++ 2 files changed, 7 insertions(+) (limited to 'linden/indra') 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) mToggleState = state; } +void LLFlyoutButton::setLabel(const LLStringExplicit& name) +{ + mActionButton->setLabel(name); +} + 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: static void onActionButtonClick(void *userdata); static void onSelectAction(LLUICtrl* ctrl, void *userdata); + void setLabel(const LLStringExplicit& name); + protected: LLButton* mActionButton; LLPointer mActionButtonImage; -- cgit v1.1