EXP-1741 FIX -- Learn more link goes to page not found from Outbox for user that is not a merchant an Agni

EXP-1746 FIX -- Update Outbox messaging
EXP-1748 FIX -- Close down on messaging with Spinner
MKT-3403 support -- viewer tooltips updated to match errors in marketplace

* Copy has been updated to match the design per Leo and Brooke
* Marketplace URL's have also been updated
* The outbox floater now reports a status string in the existing folder count control

1 files changed, 13 insertions, 10 deletions

diff --git a/indra/newview/llfloateroutbox.h b/indra/newview/llfloateroutbox.h
index 5222db1142..5cb487be64 100644
--- a/indra/newview/llfloateroutbox.h
+++ b/indra/newview/llfloateroutbox.h
@@ -80,25 +80,28 @@ protected:
 	void onImportButtonClicked();
 	void onOutboxChanged();
 	
-	void updateItemCount();
+	void setStatusString(const std::string& statusString);
+	
+	void updateFolderCount();
 	void updateView();
 
 private:
 	LLInventoryCategoriesObserver *		mCategoriesObserver;
 	LLInventoryCategoryAddedObserver *	mCategoryAddedObserver;
-
+	
+	bool			mImportBusy;
+	LLButton *		mImportButton;
+	
+	LLTextBox *		mInventoryFolderCountText;
+	LLView *		mInventoryImportInProgress;
+	LLView *		mInventoryPlaceholder;
+	LLTextBox *		mInventoryText;
+	LLTextBox *		mInventoryTitle;
+	
 	LLUUID				mOutboxId;
 	LLInventoryPanel *	mOutboxInventoryPanel;
 	U32					mOutboxItemCount;
 	
-	LLTextBox *				mInventoryFolderCountText;
-	LLView *				mInventoryImportInProgress;
-	LLView *				mInventoryPlaceholder;
-	LLTextBox *				mInventoryText;
-	LLTextBox *				mInventoryTitle;
-	
-	LLButton *		mImportButton;
-	
 	LLWindowShade *	mWindowShade;
 };