Merge from viewer-experience

1 files changed, 238 insertions, 236 deletions

diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
index f17f36a977..8d0712a328 100644
--- a/indra/newview/llpanelmarketplaceinbox.cpp
+++ b/indra/newview/llpanelmarketplaceinbox.cpp
@@ -1,236 +1,238 @@
-/** 
- * @file llpanelmarketplaceinbox.cpp
- * @brief Panel for marketplace inbox
- *
-* $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llpanelmarketplaceinbox.h"
-#include "llpanelmarketplaceinboxinventory.h"
-
-#include "llappviewer.h"
-#include "llbutton.h"
-#include "llinventorypanel.h"
-#include "llfolderview.h"
-#include "llsidepanelinventory.h"
-#include "llviewercontrol.h"
-
-
-static LLRegisterPanelClassWrapper<LLPanelMarketplaceInbox> t_panel_marketplace_inbox("panel_marketplace_inbox");
-
-const LLPanelMarketplaceInbox::Params& LLPanelMarketplaceInbox::getDefaultParams() 
-{ 
-	return LLUICtrlFactory::getDefaultParams<LLPanelMarketplaceInbox>(); 
-}
-
-// protected
-LLPanelMarketplaceInbox::LLPanelMarketplaceInbox(const Params& p)
-	: LLPanel(p)
-	, mInventoryPanel(NULL)
-{
-}
-
-LLPanelMarketplaceInbox::~LLPanelMarketplaceInbox()
-{
-	if (getChild<LLButton>("inbox_btn")->getToggleState())
-	{
-		gSavedPerAccountSettings.setString("LastInventoryInboxExpand", LLDate::now().asString());
-	}
-}
-
-// virtual
-BOOL LLPanelMarketplaceInbox::postBuild()
-{
-	LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLPanelMarketplaceInbox::handleLoginComplete, this));
-
-	LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLPanelMarketplaceInbox::onFocusReceived, this));
-	
-	return TRUE;
-}
-
-void LLPanelMarketplaceInbox::onSelectionChange()
-{
-	LLSidepanelInventory* sidepanel_inventory = dynamic_cast<LLSidepanelInventory*>(LLSideTray::getInstance()->getPanel("sidepanel_inventory"));
-		
-	sidepanel_inventory->updateVerbs();
-}
-
-
-void LLPanelMarketplaceInbox::handleLoginComplete()
-{
-	// Set us up as the class to drive the badge value for the sidebar_inventory button
-	LLSideTray::getInstance()->setTabButtonBadgeDriver("sidebar_inventory", this);
-}
-
-LLInventoryPanel * LLPanelMarketplaceInbox::setupInventoryPanel()
-{
-	LLView * inbox_inventory_placeholder = getChild<LLView>("inbox_inventory_placeholder");
-	LLView * inbox_inventory_parent = inbox_inventory_placeholder->getParent();
-
-	mInventoryPanel = 
-		LLUICtrlFactory::createFromFile<LLInventoryPanel>("panel_inbox_inventory.xml",
-														  inbox_inventory_parent,
-														  LLInventoryPanel::child_registry_t::instance());
-	
-	// Reshape the inventory to the proper size
-	LLRect inventory_placeholder_rect = inbox_inventory_placeholder->getRect();
-	mInventoryPanel->setShape(inventory_placeholder_rect);
-	
-	// Set the sort order newest to oldest, and a selection change callback
-	mInventoryPanel->setSortOrder(LLInventoryFilter::SO_DATE);	
-	mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this));
-
-	// Set up the note to display when the inbox is empty
-	mInventoryPanel->getFilter()->setEmptyLookupMessage("InventoryInboxNoItems");
-	
-	// Hide the placeholder text
-	inbox_inventory_placeholder->setVisible(FALSE);
-	
-	return mInventoryPanel;
-}
-
-void LLPanelMarketplaceInbox::onFocusReceived()
-{
-	LLSidepanelInventory * sidepanel_inventory = LLSideTray::getInstance()->getPanel<LLSidepanelInventory>("sidepanel_inventory");
-
-	sidepanel_inventory->clearSelections(true, false, true);
-}
-
-BOOL LLPanelMarketplaceInbox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)
-{
-	*accept = ACCEPT_NO;
-	return TRUE;
-}
-
-U32 LLPanelMarketplaceInbox::getFreshItemCount() const
-{
-#if SUPPORTING_FRESH_ITEM_COUNT
-	
-	//
-	// NOTE: When turning this on, be sure to test the no inbox/outbox case because this code probably
-	//       will return "2" for the Inventory and LIBRARY top-levels when that happens.
-	//
-	
-	U32 fresh_item_count = 0;
-
-	if (mInventoryPanel)
-	{
-		const LLFolderViewFolder * inbox_folder = mInventoryPanel->getRootFolder();
-		
-		if (inbox_folder)
-		{
-			LLFolderViewFolder::folders_t::const_iterator folders_it = inbox_folder->getFoldersBegin();
-			LLFolderViewFolder::folders_t::const_iterator folders_end = inbox_folder->getFoldersEnd();
-
-			for (; folders_it != folders_end; ++folders_it)
-			{
-				const LLFolderViewFolder * folder_view = *folders_it;
-				const LLInboxFolderViewFolder * inbox_folder_view = dynamic_cast<const LLInboxFolderViewFolder*>(folder_view);
-
-				if (inbox_folder_view && inbox_folder_view->isFresh())
-				{
-					fresh_item_count++;
-				}
-			}
-		}
-	}
-
-	return fresh_item_count;
-#else
-	return getTotalItemCount();
-#endif
-}
-
-U32 LLPanelMarketplaceInbox::getTotalItemCount() const
-{
-	U32 item_count = 0;
-	
-	if (mInventoryPanel)
-	{
-		const LLFolderViewFolder * inbox_folder = mInventoryPanel->getRootFolder();
-		
-		if (inbox_folder)
-		{
-			item_count += inbox_folder->getFoldersCount();
-		}
-	}
-	
-	return item_count;
-}
-
-std::string LLPanelMarketplaceInbox::getBadgeString() const
-{
-	std::string item_count_str("");
-
-	// If the inbox is visible, and the side panel is collapsed or expanded and not the inventory panel
-	if (getParent()->getVisible() &&
-		(LLSideTray::getInstance()->getCollapsed() || !LLSideTray::getInstance()->isPanelActive("sidepanel_inventory")))
-	{
-		U32 item_count = getFreshItemCount();
-
-		if (item_count)
-		{
-			item_count_str = llformat("%d", item_count);
-		}
-	}
-
-	return item_count_str;
-}
-
-void LLPanelMarketplaceInbox::draw()
-{
-	U32 item_count = getTotalItemCount();
-
-	LLView * fresh_new_count_view = getChildView("inbox_fresh_new_count");
-
-	if (item_count > 0)
-	{
-		std::string item_count_str = llformat("%d", item_count);
-
-		LLStringUtil::format_map_t args;
-		args["[NUM]"] = item_count_str;
-		getChild<LLButton>("inbox_btn")->setLabel(getString("InboxLabelWithArg", args));
-
-#if SUPPORTING_FRESH_ITEM_COUNT
-		// set green text to fresh item count
-		U32 fresh_item_count = getFreshItemCount();
-		fresh_new_count_view->setVisible((fresh_item_count > 0));
-
-		if (fresh_item_count > 0)
-		{
-			getChild<LLUICtrl>("inbox_fresh_new_count")->setTextArg("[NUM]", llformat("%d", fresh_item_count));
-		}
-#else
-		fresh_new_count_view->setVisible(FALSE);
-#endif
-	}
-	else
-	{
-		getChild<LLButton>("inbox_btn")->setLabel(getString("InboxLabelNoArg"));
-
-		fresh_new_count_view->setVisible(FALSE);
-	}
-		
-	LLPanel::draw();
-}
+/** 

+ * @file llpanelmarketplaceinbox.cpp

+ * @brief Panel for marketplace inbox

+ *

+* $LicenseInfo:firstyear=2011&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ * 

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ * 

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ * 

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ * 

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llpanelmarketplaceinbox.h"

+#include "llpanelmarketplaceinboxinventory.h"

+

+#include "llappviewer.h"

+#include "llbutton.h"

+#include "llinventorypanel.h"

+#include "llfolderview.h"

+#include "llsidepanelinventory.h"

+#include "llviewercontrol.h"

+

+

+static LLRegisterPanelClassWrapper<LLPanelMarketplaceInbox> t_panel_marketplace_inbox("panel_marketplace_inbox");

+

+const LLPanelMarketplaceInbox::Params& LLPanelMarketplaceInbox::getDefaultParams() 

+{ 

+	return LLUICtrlFactory::getDefaultParams<LLPanelMarketplaceInbox>(); 

+}

+

+// protected

+LLPanelMarketplaceInbox::LLPanelMarketplaceInbox(const Params& p)

+	: LLPanel(p)

+	, mInventoryPanel(NULL)

+{

+}

+

+LLPanelMarketplaceInbox::~LLPanelMarketplaceInbox()

+{

+}

+

+// virtual

+BOOL LLPanelMarketplaceInbox::postBuild()

+{

+	LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLPanelMarketplaceInbox::handleLoginComplete, this));

+

+	LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLPanelMarketplaceInbox::onFocusReceived, this));

+	

+	return TRUE;

+}

+

+void LLPanelMarketplaceInbox::onSelectionChange()

+{

+	LLSidepanelInventory* sidepanel_inventory = dynamic_cast<LLSidepanelInventory*>(LLSideTray::getInstance()->getPanel("sidepanel_inventory"));

+		

+	sidepanel_inventory->updateVerbs();

+}

+

+

+void LLPanelMarketplaceInbox::handleLoginComplete()

+{

+	// Set us up as the class to drive the badge value for the sidebar_inventory button

+	LLSideTray::getInstance()->setTabButtonBadgeDriver("sidebar_inventory", this);

+}

+

+LLInventoryPanel * LLPanelMarketplaceInbox::setupInventoryPanel()

+{

+	LLView * inbox_inventory_placeholder = getChild<LLView>("inbox_inventory_placeholder");

+	LLView * inbox_inventory_parent = inbox_inventory_placeholder->getParent();

+

+	mInventoryPanel = 

+		LLUICtrlFactory::createFromFile<LLInventoryPanel>("panel_inbox_inventory.xml",

+														  inbox_inventory_parent,

+														  LLInventoryPanel::child_registry_t::instance());

+	

+	llassert(mInventoryPanel);

+	

+	// Reshape the inventory to the proper size

+	LLRect inventory_placeholder_rect = inbox_inventory_placeholder->getRect();

+	mInventoryPanel->setShape(inventory_placeholder_rect);

+	

+	// Set the sort order newest to oldest

+	mInventoryPanel->setSortOrder(LLInventoryFilter::SO_DATE);	

+

+	// Set selection callback for proper update of inventory status buttons

+	mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this));

+

+	// Set up the note to display when the inbox is empty

+	mInventoryPanel->getFilter()->setEmptyLookupMessage("InventoryInboxNoItems");

+	

+	// Hide the placeholder text

+	inbox_inventory_placeholder->setVisible(FALSE);

+	

+	return mInventoryPanel;

+}

+

+void LLPanelMarketplaceInbox::onFocusReceived()

+{

+	LLSidepanelInventory * sidepanel_inventory = LLSideTray::getInstance()->getPanel<LLSidepanelInventory>("sidepanel_inventory");

+

+	sidepanel_inventory->clearSelections(true, false, true);

+

+	gSavedPerAccountSettings.setString("LastInventoryInboxActivity", LLDate::now().asString());

+}

+

+BOOL LLPanelMarketplaceInbox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)

+{

+	*accept = ACCEPT_NO;

+	return TRUE;

+}

+

+U32 LLPanelMarketplaceInbox::getFreshItemCount() const

+{

+#if SUPPORTING_FRESH_ITEM_COUNT

+	

+	//

+	// NOTE: When turning this on, be sure to test the no inbox/outbox case because this code probably

+	//       will return "2" for the Inventory and LIBRARY top-levels when that happens.

+	//

+	

+	U32 fresh_item_count = 0;

+

+	if (mInventoryPanel)

+	{

+		const LLFolderViewFolder * inbox_folder = mInventoryPanel->getRootFolder();

+		

+		if (inbox_folder)

+		{

+			LLFolderViewFolder::folders_t::const_iterator folders_it = inbox_folder->getFoldersBegin();

+			LLFolderViewFolder::folders_t::const_iterator folders_end = inbox_folder->getFoldersEnd();

+

+			for (; folders_it != folders_end; ++folders_it)

+			{

+				const LLFolderViewFolder * folder_view = *folders_it;

+				const LLInboxFolderViewFolder * inbox_folder_view = dynamic_cast<const LLInboxFolderViewFolder*>(folder_view);

+

+				if (inbox_folder_view && inbox_folder_view->isFresh())

+				{

+					fresh_item_count++;

+				}

+			}

+		}

+	}

+

+	return fresh_item_count;

+#else

+	return getTotalItemCount();

+#endif

+}

+

+U32 LLPanelMarketplaceInbox::getTotalItemCount() const

+{

+	U32 item_count = 0;

+	

+	if (mInventoryPanel)

+	{

+		const LLFolderViewFolder * inbox_folder = mInventoryPanel->getRootFolder();

+		

+		if (inbox_folder)

+		{

+			item_count += inbox_folder->getFoldersCount();

+		}

+	}

+	

+	return item_count;

+}

+

+std::string LLPanelMarketplaceInbox::getBadgeString() const

+{

+	std::string item_count_str("");

+

+	// If the inbox is visible, and the side panel is collapsed or expanded and not the inventory panel

+	if (getParent()->getVisible() &&

+		(LLSideTray::getInstance()->getCollapsed() || !LLSideTray::getInstance()->isPanelActive("sidepanel_inventory")))

+	{

+		U32 item_count = getFreshItemCount();

+

+		if (item_count)

+		{

+			item_count_str = llformat("%d", item_count);

+		}

+	}

+

+	return item_count_str;

+}

+

+void LLPanelMarketplaceInbox::draw()

+{

+	U32 item_count = getTotalItemCount();

+

+	LLView * fresh_new_count_view = getChildView("inbox_fresh_new_count");

+

+	if (item_count > 0)

+	{

+		std::string item_count_str = llformat("%d", item_count);

+

+		LLStringUtil::format_map_t args;

+		args["[NUM]"] = item_count_str;

+		getChild<LLButton>("inbox_btn")->setLabel(getString("InboxLabelWithArg", args));

+

+#if SUPPORTING_FRESH_ITEM_COUNT

+		// set green text to fresh item count

+		U32 fresh_item_count = getFreshItemCount();

+		fresh_new_count_view->setVisible((fresh_item_count > 0));

+

+		if (fresh_item_count > 0)

+		{

+			getChild<LLUICtrl>("inbox_fresh_new_count")->setTextArg("[NUM]", llformat("%d", fresh_item_count));

+		}

+#else

+		fresh_new_count_view->setVisible(FALSE);

+#endif

+	}

+	else

+	{

+		getChild<LLButton>("inbox_btn")->setLabel(getString("InboxLabelNoArg"));

+

+		fresh_new_count_view->setVisible(FALSE);

+	}

+		

+	LLPanel::draw();

+}