diff options
author | Stinson Linden <stinson@lindenlab.com> | 2014-05-31 02:30:12 +0100 |
---|---|---|
committer | Stinson Linden <stinson@lindenlab.com> | 2014-05-31 02:30:12 +0100 |
commit | 51e0cc8140a2cbe92363cb902144ccc9bf34b7c7 (patch) | |
tree | d4cd6df39edd2dc3dfb0e3a685af29f24c778ec1 /indra/newview | |
parent | 90fc7a13d1ebf766f727f4709853d2a9bd4f2d4e (diff) |
MAINT-4114: Refactoring the LLBadge code to ensure a parent view always has the badge (to preserve memory cleanliness), but to also allow for badge reparenting so that the NEW badge works in the inventory window. This change relates to 9e0d629da1487f850beb2767bd47734c4ccc393e.
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/llpanelmarketplaceinboxinventory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp index 2f65bedc2b..f7c2f629ec 100755 --- a/indra/newview/llpanelmarketplaceinboxinventory.cpp +++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp @@ -129,11 +129,11 @@ void LLInboxFolderViewFolder::addItem(LLFolderViewItem* item) // virtual void LLInboxFolderViewFolder::draw() { - if (!badgeHasParent()) + if (!hasBadgeHolderParent()) { - addBadgeToParentPanel(); + addBadgeToParentHolder(); } - + setBadgeVisibility(mFresh); LLFolderViewFolder::draw(); @@ -214,9 +214,9 @@ BOOL LLInboxFolderViewItem::handleDoubleClick(S32 x, S32 y, MASK mask) // virtual void LLInboxFolderViewItem::draw() { - if (!badgeHasParent()) + if (!hasBadgeHolderParent()) { - addBadgeToParentPanel(); + addBadgeToParentHolder(); } setBadgeVisibility(mFresh); |