diff options
| author | McCabe Maxsted | 2011-05-15 16:21:14 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-06-08 23:30:47 -0700 |
| commit | 91e4b2e493ec7aad540c0c3315ee57898926b0a1 (patch) | |
| tree | e779fafc9e9667522e061ba407c5e77e31d375a7 | |
| parent | Disable the AO sit toolbar button when the AO is disabled (diff) | |
| download | meta-impy-91e4b2e493ec7aad540c0c3315ee57898926b0a1.zip meta-impy-91e4b2e493ec7aad540c0c3315ee57898926b0a1.tar.gz meta-impy-91e4b2e493ec7aad540c0c3315ee57898926b0a1.tar.bz2 meta-impy-91e4b2e493ec7aad540c0c3315ee57898926b0a1.tar.xz | |
Fix for button labels in case there's ever a conflict between a disabled selected button and the selected label it should have
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llui/llbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp index 6c0891c..58c1dbc 100644 --- a/linden/indra/llui/llbutton.cpp +++ b/linden/indra/llui/llbutton.cpp | |||
| @@ -1038,7 +1038,7 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa | |||
| 1038 | std::string label_disabled = label; | 1038 | std::string label_disabled = label; |
| 1039 | node->getAttributeString("label_disabled", label_disabled); | 1039 | node->getAttributeString("label_disabled", label_disabled); |
| 1040 | 1040 | ||
| 1041 | std::string label_disabled_selected = label; | 1041 | std::string label_disabled_selected = label_selected; |
| 1042 | node->getAttributeString("label_disabled_selected", label_disabled_selected); | 1042 | node->getAttributeString("label_disabled_selected", label_disabled_selected); |
| 1043 | 1043 | ||
| 1044 | LLFontGL* font = selectFont(node); | 1044 | LLFontGL* font = selectFont(node); |