From edcf44ad5905b633acf07bd00437ceeaf8fe8d1b Mon Sep 17 00:00:00 2001 From: Vladimir Pchelko Date: Fri, 2 Jul 2010 14:56:24 +0300 Subject: EXT-7473 FIXED ("Share" button was added to "gear" menu in Inventory SP.) Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/678/ --HG-- branch : product-engine --- indra/newview/llpanelmaininventory.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llpanelmaininventory.cpp') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 9eece81861..7412812c62 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -53,6 +53,8 @@ #include "lltooldraganddrop.h" #include "llviewermenu.h" #include "llviewertexturelist.h" +#include "llsidepanelinventory.h" +#include "llsidetray.h" const std::string FILTERS_FILENAME("filters.xml"); @@ -1158,6 +1160,12 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata) return FALSE; } + if (command_name == "share") + { + LLSidepanelInventory* parent = dynamic_cast(LLSideTray::getInstance()->getPanel("sidepanel_inventory")); + return parent ? parent->canShare() : FALSE; + } + return TRUE; } -- cgit v1.2.3