diff options
| author | Leslie Linden <none@none> | 2011-06-06 17:00:59 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-06 17:00:59 -0700 |
| commit | 98bcd9e2efe4cc0dc5e51da09c6f18424b9d9144 (patch) | |
| tree | bc60274730d7515c1088f7d4a99cb6308297474b /indra/newview/llpanelmarketplaceinbox.cpp | |
| parent | 0c0f7558782edccda375609777967184b8440441 (diff) | |
EXP-859 FIX -- Save setting for last time inbox expanded
EXP-841 PROGRESS -- Create outbox sync button with basic enable/disable logic and animation
EXP-866 PROGRESS -- Create inbox observer to dynamically update inbox item count and badge value
EXP-872 PROGRESS -- Hide inbox and outbox unless applicable
Inbox expansion time is now saved as setting variable "LastInventoryInboxExpand".
New outbox sync button art.
Observers for items and categories are now implemented in the LLSidepanelInventory but the exact
method of use is still to be determined.
Functions are in place to show and hide the inbox and outbox panels but the logic around the
decision is TBD.
The resize bar for the inbox/outbox is now disabled when both inbox and outbox are collapsed.
Reviewed by Leyla.
Diffstat (limited to 'indra/newview/llpanelmarketplaceinbox.cpp')
| -rw-r--r-- | indra/newview/llpanelmarketplaceinbox.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp index b401087345..6cebc5dd5a 100644 --- a/indra/newview/llpanelmarketplaceinbox.cpp +++ b/indra/newview/llpanelmarketplaceinbox.cpp @@ -68,7 +68,17 @@ void LLPanelMarketplaceInbox::draw() model->getDirectDescendentsOf(model->findCategoryUUIDForType(LLFolderType::FT_INBOX, false, false), cats, items); - S32 item_count = cats->size() + items->size(); + S32 item_count = 0; + + if (cats) + { + item_count += cats->size(); + } + + if (items) + { + item_count += items->size(); + } if (item_count) { |