merge

1 files changed, 7 insertions, 2 deletions

diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
index f80a3a9dd3..b7d11f7f9b 100644
--- a/indra/newview/llsidepanelinventory.h
+++ b/indra/newview/llsidepanelinventory.h
@@ -29,11 +29,13 @@
 
 #include "llpanel.h"
 
+class LLButton;
 class LLFolderViewItem;
 class LLInboxOutboxAddedObserver;
 class LLInventoryCategoriesObserver;
 class LLInventoryItem;
 class LLInventoryPanel;
+class LLLayoutPanel;
 class LLPanelMainInventory;
 class LLSidepanelItemInfo;
 class LLSidepanelTaskInfo;
@@ -58,7 +60,7 @@ public:
 	LLInventoryPanel* getActivePanel(); // Returns an active inventory panel, if any.
 	LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; }
 	BOOL isMainInventoryPanelActive() const;
-	
+
 	void clearSelections(bool clearMain, bool clearInbox, bool clearOutbox);
 	std::set<LLUUID> getInboxOrOutboxSelectionList();
 
@@ -74,10 +76,11 @@ public:
 
 	void enableInbox(bool enabled);
 	void enableOutbox(bool enabled);
-
+	
 	bool isInboxEnabled() const { return mInboxEnabled; }
 	bool isOutboxEnabled() const { return mOutboxEnabled; }
 
+	void updateOutboxUserStatus();
 	void updateVerbs();
 
 protected:
@@ -93,6 +96,8 @@ protected:
 	void onInboxChanged(const LLUUID& inbox_id);
 	void onOutboxChanged(const LLUUID& outbox_id);
 
+	bool manageInboxOutboxPanels(LLButton * pressedButton, LLLayoutPanel * pressedPanel, LLButton * otherButton, LLLayoutPanel * otherPanel);
+
 	//
 	// UI Elements
 	//