diff options
| author | Jay Threeth | 2011-04-23 12:52:44 -0700 |
|---|---|---|
| committer | Jay Threeth | 2011-04-23 12:52:44 -0700 |
| commit | 868c30aecfa1fb6a0a1f36448bc1a42c861b45ff (patch) | |
| tree | 6e1cccd381ecf4376dfda7fd97e52f82e08e1619 /linden/indra/llui/llcombobox.cpp | |
| parent | Build libotr, and static link it, libgpg-error and libgcrypt into the exe (on... (diff) | |
| parent | The next part of the UI changes for OTR. (diff) | |
| download | meta-impy-868c30aecfa1fb6a0a1f36448bc1a42c861b45ff.zip meta-impy-868c30aecfa1fb6a0a1f36448bc1a42c861b45ff.tar.gz meta-impy-868c30aecfa1fb6a0a1f36448bc1a42c861b45ff.tar.bz2 meta-impy-868c30aecfa1fb6a0a1f36448bc1a42c861b45ff.tar.xz | |
Merge branch 'libotr' of github.com:onefang/meta-impy into libotr
Diffstat (limited to 'linden/indra/llui/llcombobox.cpp')
| -rw-r--r-- | linden/indra/llui/llcombobox.cpp | 5 |
1 files changed, 5 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 | |||