merge

1 files changed, 2 insertions, 5 deletions

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