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 ++++++++ indra/newview/llsidepanelinventory.h | 5 +++-- .../skins/default/xui/en/menu_inventory_gear_default.xml | 11 +++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) 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; } diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index 951fdd630c..f2f2509f9a 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -58,6 +58,9 @@ public: void showTaskInfoPanel(); void showInventoryPanel(); + // checks can share selected item(s) + bool canShare(); + protected: // Tracks highlighted (selected) item in inventory panel. LLInventoryItem *getSelectedItem(); @@ -65,8 +68,6 @@ protected: void onSelectionChange(const std::deque &items, BOOL user_action); // "wear", "teleport", etc. void performActionOnSelection(const std::string &action); - bool canShare(); - void updateVerbs(); // diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index 62365f7cc2..c394700081 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -81,6 +81,17 @@ function="Inventory.GearDefault.Enable" parameter="save_texture" /> + + + + Date: Fri, 2 Jul 2010 15:07:33 +0300 Subject: EXT-8145 FIXED disabled committing on selection change when list's selection is restored (panel edit outfit) turning off committing on selection change for the COF Wearables flat lists while restoring selection between refreshes/updates Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/683/ --HG-- branch : product-engine --- indra/newview/llcofwearables.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp index 472d2ccf24..f278fb6a7b 100644 --- a/indra/newview/llcofwearables.cpp +++ b/indra/newview/llcofwearables.cpp @@ -372,6 +372,11 @@ void LLCOFWearables::refresh() iter != iter_end; ++iter) { LLFlatListView* list = iter->first; + if (!list) continue; + + //restoring selection should not fire commit callbacks + list->setCommitOnSelectionChange(false); + const values_vector_t& values = iter->second; for (values_vector_t::const_iterator value_it = values.begin(), @@ -385,6 +390,8 @@ void LLCOFWearables::refresh() list->selectItemByValue(*value_it); } } + + list->setCommitOnSelectionChange(true); } } -- cgit v1.2.3 From 9388a14e47c61cb5745494982b588a93e4f9d811 Mon Sep 17 00:00:00 2001 From: Vladimir Pchelko Date: Fri, 2 Jul 2010 15:07:33 +0300 Subject: EXT-8136 FIXED (Accordion order in outfit editor was corrected. (Attachment / Clothing / Body). -> (Clothing / Attachment / Body).) Reviewed by Vadim Savchuk and Neal Orman https://codereview.productengine.com/secondlife/r/671/ --HG-- branch : product-engine --- .../skins/default/xui/en/panel_cof_wearables.xml | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml index d5943ea156..f438e3d42d 100644 --- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml @@ -22,40 +22,40 @@ width="311"> + name="tab_clothing" + title="Clothing"> - - + width="311" /> + name="tab_attachments" + title="Attachments"> + width="311"> + +