diff options
author | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
---|---|---|
committer | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
commit | ee14005a2aea89b2988fa0a5060f38b669e45389 (patch) | |
tree | 3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/newview/llpanelmarketplaceinboxinventory.cpp | |
parent | a92dbb592b338f48f7b75b68a9da511dc95279f9 (diff) | |
parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) |
viewer-release merge
Diffstat (limited to 'indra/newview/llpanelmarketplaceinboxinventory.cpp')
-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); |