diff options
author | Leslie Linden <none@none> | 2011-06-07 13:57:19 -0700 |
---|---|---|
committer | Leslie Linden <none@none> | 2011-06-07 13:57:19 -0700 |
commit | 1aed9849285b574346087eb5ac7e0c8038fa21fe (patch) | |
tree | 63bed798da119dc094a360c88a02874a22d365d2 /indra/llui/llbutton.cpp | |
parent | 98bcd9e2efe4cc0dc5e51da09c6f18424b9d9144 (diff) |
EXP-865 PROGRESS -- Modify LLBadge to allow it to hang off of non-buttons
Added the following for increased LLBadge functionality:
* Panels now choose whether or not they accept buttons as children, which they
do by default.
* UI controls now shuffle controls with "requests_front" to the front of their
children list at postBuild time.
* Badges are set to "requests_front" by default
* Badges now accept border image and color attributes
Reviewed by Callum
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rw-r--r-- | indra/llui/llbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index a63281b3c1..c841933a5f 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -1098,7 +1098,7 @@ void LLButton::addBadgeToParentPanel() { parentPanel = dynamic_cast<LLPanel*>(parent); - if (parentPanel != NULL) + if (parentPanel && parentPanel->acceptsBadge()) { break; } |