1 files changed, 106 insertions, 2 deletions

diff --git a/indra/newview/llpanelmarketplaceoutboxinventory.cpp b/indra/newview/llpanelmarketplaceoutboxinventory.cpp
index 638d3c5150..14b6ee9e0a 100644
--- a/indra/newview/llpanelmarketplaceoutboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceoutboxinventory.cpp
@@ -34,6 +34,7 @@
 #include "llinventoryfunctions.h"
 #include "llpanellandmarks.h"
 #include "llplacesinventorybridge.h"
+#include "lltrans.h"
 #include "llviewerfoldertype.h"
 
 
@@ -46,6 +47,50 @@ static LLDefaultChildRegistry::Register<LLOutboxFolderViewFolder> r2("outbox_fol
 
 
 //
+// Marketplace errors
+//
+
+enum
+{
+	MKTERR_NONE = 0,
+
+	MKTERR_NOT_MERCHANT,
+	MKTERR_FOLDER_EMPTY,
+	MKTERR_UNASSOCIATED_PRODUCTS,
+	MKTERR_OBJECT_LIMIT,
+	MKTERR_FOLDER_DEPTH,
+	MKTERR_UNSELLABLE_ITEM,
+	MKTERR_INTERNAL_IMPORT,
+
+	MKTERR_COUNT
+};
+
+static const std::string MARKETPLACE_ERROR_STRINGS[MKTERR_COUNT] =
+{
+	"NO_ERROR",
+	"NOT_MERCHANT_ERROR",
+	"FOLDER_EMPTY_ERROR",
+	"UNASSOCIATED_PRODUCTS_ERROR",
+	"OBJECT_LIMIT_ERROR",
+	"FOLDER_DEPTH_ERROR",
+	"UNSELLABLE_ITEM_FOUND",
+	"INTERNAL_IMPORT_ERROR",
+};
+
+static const std::string MARKETPLACE_ERROR_NAMES[MKTERR_COUNT] =
+{
+	"Marketplace Error None",
+	"Marketplace Error Not Merchant",
+	"Marketplace Error Empty Folder",
+	"Marketplace Error Unassociated Products",
+	"Marketplace Error Object Limit",
+	"Marketplace Error Folder Depth",
+	"Marketplace Error Unsellable Item",
+	"Marketplace Error Internal Import",
+};
+
+
+//
 // LLOutboxInventoryPanel Implementation
 //
 
@@ -133,6 +178,27 @@ LLFolderViewFolder * LLOutboxInventoryPanel::createFolderViewFolder(LLInvFVBridg
 	return LLUICtrlFactory::create<LLOutboxFolderViewFolder>(params);
 }
 
+LLFolderViewItem * LLOutboxInventoryPanel::createFolderViewItem(LLInvFVBridge * bridge)
+{
+	LLFolderViewItem::Params params;
+
+	params.name = bridge->getDisplayName();
+	params.icon = bridge->getIcon();
+	params.icon_open = bridge->getOpenIcon();
+
+	if (mShowItemLinkOverlays) // if false, then links show up just like normal items
+	{
+		params.icon_overlay = LLUI::getUIImage("Inv_Link");
+	}
+
+	params.creation_date = bridge->getCreationDate();
+	params.root = mFolderRoot;
+	params.listener = bridge;
+	params.rect = LLRect (0, 0, 0, 0);
+	params.tool_tip = params.name;
+
+	return LLUICtrlFactory::create<LLOutboxFolderViewItem>(params);
+}
 
 //
 // LLOutboxFolderViewFolder Implementation
@@ -141,7 +207,7 @@ LLFolderViewFolder * LLOutboxInventoryPanel::createFolderViewFolder(LLInvFVBridg
 LLOutboxFolderViewFolder::LLOutboxFolderViewFolder(const Params& p)
 	: LLFolderViewFolder(p)
 	, LLBadgeOwner(getHandle())
-	, mError(false)
+	, mError(0)
 {
 	initBadgeParams(p.error_badge());
 }
@@ -158,15 +224,53 @@ void LLOutboxFolderViewFolder::draw()
 		addBadgeToParentPanel();
 	}
 	
-	setBadgeVisibility(mError);
+	setBadgeVisibility(hasError());
 
 	LLFolderViewFolder::draw();
 }
 
+void LLOutboxFolderViewFolder::setErrorString(const std::string& errorString)
+{
+	S32 error_code = MKTERR_NONE;
+
+	for (S32 i = 1; i < MKTERR_COUNT; ++i)
+	{
+		if (MARKETPLACE_ERROR_STRINGS[i] == errorString)
+		{
+			error_code = i;
+			break;
+		}
+	}
+
+	setError(error_code);
+}
+
+void LLOutboxFolderViewFolder::setError(S32 errorCode)
+{
+	mError = errorCode;
+
+	if (hasError())
+	{
+		setToolTip(LLTrans::getString(MARKETPLACE_ERROR_NAMES[mError]));
+	}
+	else
+	{
+		setToolTip(LLStringExplicit(""));
+	}
+}
+
 void LLOutboxFolderViewFolder::setCreationDate(time_t creation_date_utc) const
 { 
 	mCreationDate = creation_date_utc; 
 }
 
+//
+// LLOutboxFolderViewItem Implementation
+//
+
+BOOL LLOutboxFolderViewItem::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+	return TRUE;
+}
 
 // eof