diff options
| author | Leslie Linden <none@none> | 2011-06-14 16:35:15 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-14 16:35:15 -0700 |
| commit | 142c2fc29c9645df1bff924d6a61c09f04713a7b (patch) | |
| tree | b4a578097f712518c4a805013596bc9dc2efa729 /indra/newview/llpanelmarketplaceinbox.h | |
| parent | 3eeb14ee0abb5720e010d94eba52db09fa32237e (diff) | |
EXP-896 FIX -- Inbox not opened by default when new items are received
EXP-894 FIX -- When scrolling to the bottom of the inbox, the last item is c...
EXP-856 FIX -- Inbox item count reflected as badge on inventory button
* Inbox auto-expands when "fresh" items are reported
* Logic for "fresh" item determination is still in progress but works for purchases while logged in
* Badges now only displayed when the inventory side panel is collapsed or when inventory not visible
Reviewed by Leyla
Diffstat (limited to 'indra/newview/llpanelmarketplaceinbox.h')
| -rw-r--r-- | indra/newview/llpanelmarketplaceinbox.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h index 61e8cf3c1f..21069a0ea1 100644 --- a/indra/newview/llpanelmarketplaceinbox.h +++ b/indra/newview/llpanelmarketplaceinbox.h @@ -36,9 +36,17 @@ class LLPanelMarketplaceInbox : public LLPanel, public LLSideTrayTabBadgeDriver { public: + struct Params : public LLInitParam::Block<Params, LLPanel::Params> + { + Params() {} + }; + LOG_CLASS(LLPanelMarketplaceInbox); - LLPanelMarketplaceInbox(); + // RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8 + static const LLPanelMarketplaceInbox::Params& getDefaultParams(); + + LLPanelMarketplaceInbox(const Params& p = getDefaultParams()); ~LLPanelMarketplaceInbox(); /*virtual*/ BOOL postBuild(); @@ -47,7 +55,9 @@ public: /*virtual*/ void draw(); - U32 getItemCount() const; + U32 getFreshItemCount() const; + U32 getTotalItemCount() const; + std::string getBadgeString() const; private: |