summaryrefslogtreecommitdiff
path: root/indra/llui/llbadge.h
diff options
context:
space:
mode:
authorLeslie Linden <none@none>2011-06-07 13:57:19 -0700
committerLeslie Linden <none@none>2011-06-07 13:57:19 -0700
commit1aed9849285b574346087eb5ac7e0c8038fa21fe (patch)
tree63bed798da119dc094a360c88a02874a22d365d2 /indra/llui/llbadge.h
parent98bcd9e2efe4cc0dc5e51da09c6f18424b9d9144 (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/llbadge.h')
-rw-r--r--indra/llui/llbadge.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llbadge.h b/indra/llui/llbadge.h
index c2e0a763b2..05a76af42c 100644
--- a/indra/llui/llbadge.h
+++ b/indra/llui/llbadge.h
@@ -94,6 +94,9 @@ public:
{
Optional< LLHandle<LLUICtrl> > owner; // Mandatory in code but not in xml
+ Optional< LLUIImage* > border_image;
+ Optional< LLUIColor > border_color;
+
Optional< LLUIImage* > image;
Optional< LLUIColor > image_color;
@@ -126,6 +129,9 @@ public:
void setLabel( const LLStringExplicit& label);
private:
+ LLPointer< LLUIImage > mBorderImage;
+ LLUIColor mBorderColor;
+
const LLFontGL* mGLFont;
LLPointer< LLUIImage > mImage;