diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-26 09:12:08 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-26 09:12:08 -0400 |
commit | 3a7513b5875b86c247dd49fe78b8fab955ba5e0a (patch) | |
tree | 3f942d50b41fd090550541af01bb50d23d845c09 /indra/llui/llbadge.h | |
parent | 06954294b8739dd51abe75e3710da6e496b353d4 (diff) | |
parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) |
DRTVWR-453: Merge up to latest viewer-release.
Diffstat (limited to 'indra/llui/llbadge.h')
-rw-r--r-- | indra/llui/llbadge.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llbadge.h b/indra/llui/llbadge.h index 4b21a71aaa..55f92e6e34 100644 --- a/indra/llui/llbadge.h +++ b/indra/llui/llbadge.h @@ -137,6 +137,8 @@ public: const std::string getLabel() const { return wstring_to_utf8str(mLabel); } void setLabel( const LLStringExplicit& label); + void setDrawAtParentTop(bool draw_at_top) { mDrawAtParentTop = draw_at_top;} + private: LLPointer< LLUIImage > mBorderImage; LLUIColor mBorderColor; @@ -164,6 +166,7 @@ private: F32 mPaddingVert; LLScrollContainer* mParentScroller; + bool mDrawAtParentTop; }; // Build time optimization, generate once in .cpp file |