diff options
| author | Leslie Linden <none@none> | 2011-06-09 12:12:28 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-09 12:12:28 -0700 |
| commit | def85f2778d9b69bc3fb0e89c1cef854a1c01886 (patch) | |
| tree | bfae24f88d2a2679d5812a9684b33a5750d946c6 /indra/llui/llbadge.h | |
| parent | 6e928645b94901518fe452ab7fab0278e87613d7 (diff) | |
EXP-865 FIX -- Modify LLBadge to allow it to hang off of non-buttons
LLBadgeOwner now only depends on LLView instead of LLUICtrl
Sidebar Tab Buttons now can support badges
Reviewed by Leyla
Diffstat (limited to 'indra/llui/llbadge.h')
| -rw-r--r-- | indra/llui/llbadge.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llbadge.h b/indra/llui/llbadge.h index 05a76af42c..0f923ef01b 100644 --- a/indra/llui/llbadge.h +++ b/indra/llui/llbadge.h @@ -33,6 +33,7 @@ #include "lluictrl.h" #include "llstring.h" #include "lluiimage.h" +#include "llview.h" // // Declarations @@ -92,7 +93,7 @@ public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional< LLHandle<LLUICtrl> > owner; // Mandatory in code but not in xml + Optional< LLHandle<LLView> > owner; // Mandatory in code but not in xml Optional< LLUIImage* > border_image; Optional< LLUIColor > border_color; @@ -144,7 +145,7 @@ private: F32 mLocationPercentHCenter; F32 mLocationPercentVCenter; - LLHandle< LLUICtrl > mOwner; + LLHandle< LLView > mOwner; F32 mPaddingHoriz; F32 mPaddingVert; |