From c679ae3546ffe0f29330a2969460fa37807e23b6 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Mon, 1 Feb 2010 17:11:31 +0200
Subject: Fixed normal bug EXT-4768 - 'Play' btn does nothing to gesture in
 Inventory side panel.

--HG--
branch : product-engine
---
 indra/newview/llsidepanelinventory.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llsidepanelinventory.cpp')

diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 5383158cd3..7b923f4b0b 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -164,7 +164,21 @@ void LLSidepanelInventory::onWearButtonClicked()
 
 void LLSidepanelInventory::onPlayButtonClicked()
 {
-	performActionOnSelection("activate");
+	const LLInventoryItem *item = getSelectedItem();
+	if (!item)
+	{
+		return;
+	}
+
+	switch(item->getInventoryType())
+	{
+	case LLInventoryType::IT_GESTURE:
+		performActionOnSelection("play");
+		break;
+	default:
+		performActionOnSelection("activate");
+		break;
+	}
 }
 
 void LLSidepanelInventory::onTeleportButtonClicked()
-- 
cgit v1.2.3


From b428711814af79533503b8894423502762a54ae7 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Wed, 3 Feb 2010 15:43:07 +0800
Subject: EXT-4603) Right-clicking a sound and choosing Play doesn't actually
 play it

---
 indra/newview/llsidepanelinventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llsidepanelinventory.cpp')

diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 7b923f4b0b..3fd5309947 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -176,7 +176,7 @@ void LLSidepanelInventory::onPlayButtonClicked()
 		performActionOnSelection("play");
 		break;
 	default:
-		performActionOnSelection("activate");
+		performActionOnSelection("open");
 		break;
 	}
 }
-- 
cgit v1.2.3


From 7e1932878563e5847335d5dcb66c9b23232c372c Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 8 Feb 2010 14:52:24 -0500
Subject: EXT-4846 : [NUX] Inventory Side Panel - Can we suppress the
 "Landmarks" and "My FavoriteS" folder since they have their own Task Panel?

Adding simple infrastructure for supporting ability to hide folder types from inventory panels, but NOT exercising this code.  This will be deferred for 2.1.
Also did some very superficial header file cleanup for LLInventoryPanel.
---
 indra/newview/llsidepanelinventory.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llsidepanelinventory.cpp')

diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 3fd5309947..73880563d7 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -62,7 +62,7 @@ BOOL LLSidepanelInventory::postBuild()
 	// UI elements from inventory panel
 	{
 		mInventoryPanel = getChild<LLPanel>("sidepanel__inventory_panel");
-		
+
 		mInfoBtn = mInventoryPanel->getChild<LLButton>("info_btn");
 		mInfoBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onInfoButtonClicked, this));
 		
@@ -83,6 +83,14 @@ BOOL LLSidepanelInventory::postBuild()
 		
 		mPanelMainInventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
 		mPanelMainInventory->setSelectCallback(boost::bind(&LLSidepanelInventory::onSelectionChange, this, _1, _2));
+
+		/* 
+		   EXT-4846 : "Can we suppress the "Landmarks" and "My Favorites" folder since they have their own Task Panel?"
+		   Deferring this until 2.1.
+		LLInventoryPanel *my_inventory_panel = mPanelMainInventory->getChild<LLInventoryPanel>("All Items");
+		my_inventory_panel->addHideFolderType(LLFolderType::FT_LANDMARK);
+		my_inventory_panel->addHideFolderType(LLFolderType::FT_FAVORITE);
+		*/
 	}
 
 	// UI elements from item panel
-- 
cgit v1.2.3