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-enginemeow-7.2.2
parent
4081f6f584
commit
edcf44ad59
|
|
@ -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<LLSidepanelInventory*>(LLSideTray::getInstance()->getPanel("sidepanel_inventory"));
|
||||
return parent ? parent->canShare() : FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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<LLFolderViewItem*> &items, BOOL user_action);
|
||||
// "wear", "teleport", etc.
|
||||
void performActionOnSelection(const std::string &action);
|
||||
bool canShare();
|
||||
|
||||
void updateVerbs();
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -81,6 +81,17 @@
|
|||
function="Inventory.GearDefault.Enable"
|
||||
parameter="save_texture" />
|
||||
</menu_item_call>
|
||||
<menu_item_call
|
||||
label="Share"
|
||||
layout="topleft"
|
||||
name="Share"
|
||||
visible="true">
|
||||
<on_click
|
||||
function="Inventory.Share" />
|
||||
<on_enable
|
||||
function="Inventory.GearDefault.Enable"
|
||||
parameter="share" />
|
||||
</menu_item_call>
|
||||
<menu_item_call
|
||||
label="Find Original"
|
||||
layout="topleft"
|
||||
|
|
|
|||
Loading…
Reference in New Issue