From 5e3d344fba6f73959d9a8caeac68984d2ae99004 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 15 Jun 2011 16:21:19 -0700 Subject: EXP-872 FIX -- Hide inbox and outbox unless applicable EXP-893 FIX -- Single order purchases not sorted with most recent item delivered at top of list EXP-904 FIX -- Newness/Freshness value out of synch with new items in Inbox on next login when ordering in bulk with Inventory window open * Inbox and outbox can now be forced on by setting the debug variables "InventoryDisplayInbox" and "InventoryDisplayOutbox" * Inbox is only displayed when logging into a grid that has a marketplace that returns pup as a merchant * Inbox contents is now a forced download when the user logs in, rather than the typical lazy load of the rest of the inventory Reviewed by Leyla --- indra/newview/llsidepanelinventory.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'indra/newview/llsidepanelinventory.h') diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index 8047e11566..25fc28d56b 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -30,7 +30,6 @@ #include "llpanel.h" class LLFolderViewItem; -class LLInboxOutboxInventoryAddedObserver; class LLInventoryCategoriesObserver; class LLInventoryItem; class LLInventoryPanel; @@ -44,6 +43,8 @@ public: LLSidepanelInventory(); virtual ~LLSidepanelInventory(); + void handleLoginComplete(); + /*virtual*/ BOOL postBuild(); /*virtual*/ void onOpen(const LLSD& key); @@ -61,12 +62,9 @@ public: void onToggleInboxBtn(); void onToggleOutboxBtn(); - void updateInboxOutboxPanels(); void enableInbox(bool enabled); void enableOutbox(bool enabled); - virtual void draw(); - protected: // Tracks highlighted (selected) item in inventory panel. LLInventoryItem *getSelectedItem(); @@ -112,7 +110,6 @@ private: bool mInventoryFetched; LLInventoryCategoriesObserver* mCategoriesObserver; - LLInboxOutboxInventoryAddedObserver* mInboxOutboxAddedObserver; }; #endif //LL_LLSIDEPANELINVENTORY_H -- cgit v1.2.3