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.cpp | |
| parent | 06954294b8739dd51abe75e3710da6e496b353d4 (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
DRTVWR-453: Merge up to latest viewer-release.
Diffstat (limited to 'indra/llui/llbadge.cpp')
| -rw-r--r-- | indra/llui/llbadge.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llui/llbadge.cpp b/indra/llui/llbadge.cpp index 15b6899d74..589b75ab5b 100644 --- a/indra/llui/llbadge.cpp +++ b/indra/llui/llbadge.cpp @@ -102,6 +102,7 @@ LLBadge::LLBadge(const LLBadge::Params& p) , mPaddingHoriz(p.padding_horiz) , mPaddingVert(p.padding_vert) , mParentScroller(NULL) + , mDrawAtParentTop(false) { if (mImage.isNull()) { @@ -307,7 +308,14 @@ void LLBadge::draw() // Compute y position if (mLocationOffsetVCenter == BADGE_OFFSET_NOT_SPECIFIED) { - badge_center_y = owner_rect.mBottom + owner_rect.getHeight() * mLocationPercentVCenter; + if(mDrawAtParentTop) + { + badge_center_y = owner_rect.mTop - badge_height * 0.5f - 1; + } + else + { + badge_center_y = owner_rect.mBottom + owner_rect.getHeight() * mLocationPercentVCenter; + } } else { |